diff --git a/.travis.yml b/.travis.yml
index 901dee8186..c42923886d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: bionic
 
 env:
   # Install the latest docker-compose version for ci testing.
@@ -12,6 +12,9 @@ env:
   DSPACE_REST_NAMESPACE: '/server/api'
   DSPACE_REST_SSL: false
 
+services:
+  - xvfb
+
 before_install:
   # Docker Compose Install
   - curl -L https://github.com/docker/compose/releases/download/${COMPOSE_VERSION}/docker-compose-`uname -s`-`uname -m` > docker-compose
@@ -33,14 +36,6 @@ before_script:
 after_script:
   - docker-compose -f ./docker/docker-compose-travis.yml down
 
-addons:
-  apt:
-    sources:
-      - google-chrome
-    packages:
-      - dpkg
-      - google-chrome-stable
-
 language: node_js
 
 node_js:
@@ -53,8 +48,6 @@ cache:
 bundler_args: --retry 5
 
 script:
-  # Use Chromium instead of Chrome.
-  - export CHROME_BIN=chromium-browser
   - yarn run build
   - yarn run ci
   - cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js
diff --git a/e2e/app.po.ts b/e2e/app.po.ts
index 54b5b55af3..c76bef118f 100644
--- a/e2e/app.po.ts
+++ b/e2e/app.po.ts
@@ -2,7 +2,8 @@ import { browser, element, by } from 'protractor';
 
 export class ProtractorPage {
   navigateTo() {
-    return browser.get('/');
+    return browser.get('/')
+      .then(() => browser.waitForAngular());
   }
 
   getPageTitleText() {
diff --git a/e2e/search-navbar/search-navbar.e2e-spec.ts b/e2e/search-navbar/search-navbar.e2e-spec.ts
new file mode 100644
index 0000000000..b60f71919d
--- /dev/null
+++ b/e2e/search-navbar/search-navbar.e2e-spec.ts
@@ -0,0 +1,46 @@
+import { ProtractorPage } from './search-navbar.po';
+import { browser } from 'protractor';
+
+describe('protractor SearchNavbar', () => {
+  let page: ProtractorPage;
+  let queryString: string;
+
+  beforeEach(() => {
+    page = new ProtractorPage();
+    queryString = 'the test query';
+  });
+
+  it('should go to search page with correct query if submitted (from home)', () => {
+    page.navigateToHome();
+    return checkIfSearchWorks();
+  });
+
+  it('should go to search page with correct query if submitted (from search)', () => {
+    page.navigateToSearch();
+    return checkIfSearchWorks();
+  });
+
+  it('check if can submit search box with pressing button', () => {
+    page.navigateToHome();
+    page.expandAndFocusSearchBox();
+    page.setCurrentQuery(queryString);
+    page.submitNavbarSearchForm();
+    browser.wait(() => {
+      return browser.getCurrentUrl().then((url: string) => {
+        return url.indexOf('query=' + encodeURI(queryString)) !== -1;
+      });
+    });
+  });
+
+  function checkIfSearchWorks(): boolean {
+    page.setCurrentQuery(queryString);
+    page.submitByPressingEnter();
+    browser.wait(() => {
+      return browser.getCurrentUrl().then((url: string) => {
+        return url.indexOf('query=' + encodeURI(queryString)) !== -1;
+      });
+    });
+    return false;
+  }
+
+});
diff --git a/e2e/search-navbar/search-navbar.po.ts b/e2e/search-navbar/search-navbar.po.ts
new file mode 100644
index 0000000000..17112ab468
--- /dev/null
+++ b/e2e/search-navbar/search-navbar.po.ts
@@ -0,0 +1,40 @@
+import { browser, element, by, protractor } from 'protractor';
+import { promise } from 'selenium-webdriver';
+
+export class ProtractorPage {
+  HOME = '/home';
+  SEARCH = '/search';
+
+  navigateToHome() {
+    return browser.get(this.HOME);
+  }
+
+  navigateToSearch() {
+    return browser.get(this.SEARCH);
+  }
+
+  getCurrentQuery(): promise.Promise<string> {
+    return element(by.css('#search-navbar-container form input')).getAttribute('value');
+  }
+
+  expandAndFocusSearchBox() {
+    element(by.css('#search-navbar-container form a')).click();
+  }
+
+  setCurrentQuery(query: string) {
+    element(by.css('#search-navbar-container form input[name="query"]')).sendKeys(query);
+  }
+
+  submitNavbarSearchForm() {
+    element(by.css('#search-navbar-container form .submit-icon')).click();
+  }
+
+  submitByPressingEnter() {
+    element(by.css('#search-navbar-container form input[name="query"]')).sendKeys(protractor.Key.ENTER);
+  }
+
+  submitByPressingEnter() {
+    element(by.css('#search-navbar-container form input[name="query"]')).sendKeys(protractor.Key.ENTER);
+  }
+
+}
diff --git a/e2e/search-page/search-page.po.ts b/e2e/search-page/search-page.po.ts
index fde3e68bf8..51bf86453b 100644
--- a/e2e/search-page/search-page.po.ts
+++ b/e2e/search-page/search-page.po.ts
@@ -1,4 +1,4 @@
-import { browser, element, by, protractor } from 'protractor';
+import { browser, by, element, protractor } from 'protractor';
 import { promise } from 'selenium-webdriver';
 
 export class ProtractorPage {
@@ -27,15 +27,15 @@ export class ProtractorPage {
   }
 
   setCurrentScope(scope: string) {
-    element(by.css('option[value="' + scope + '"]')).click();
+    element(by.css('#search-form option[value="' + scope + '"]')).click();
   }
 
   setCurrentQuery(query: string) {
-    element(by.css('input[name="query"]')).sendKeys(query);
+    element(by.css('#search-form input[name="query"]')).sendKeys(query);
   }
 
   submitSearchForm() {
-    element(by.css('button.search-button')).click();
+    element(by.css('#search-form button.search-button')).click();
   }
 
   getRandomScopeOption(): promise.Promise<string> {
diff --git a/karma.conf.js b/karma.conf.js
index 456c2ecd99..f40c8b2166 100644
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -15,7 +15,11 @@ module.exports = function (config) {
   };
 
   var configuration = {
-
+    client: {
+      jasmine: {
+        random: false
+      }
+    },
     // base path that will be used to resolve all patterns (e.g. files, exclude)
     basePath: '',
 
diff --git a/package.json b/package.json
index 3a54b941dd..b4a40c0a19 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "node": "8.* || >= 10.*"
   },
   "resolutions": {
+    "serialize-javascript": ">= 2.1.2",
     "set-value": ">= 2.0.1"
   },
   "scripts": {
@@ -74,37 +75,38 @@
     "sync-i18n": "node ./scripts/sync-i18n-files.js"
   },
   "dependencies": {
-    "@angular/animations": "^6.1.4",
-    "@angular/cli": "^6.1.5",
-    "@angular/common": "^6.1.4",
-    "@angular/core": "^6.1.4",
-    "@angular/forms": "^6.1.4",
-    "@angular/http": "^6.1.4",
-    "@angular/platform-browser": "^6.1.4",
-    "@angular/platform-browser-dynamic": "^6.1.4",
-    "@angular/platform-server": "^6.1.4",
-    "@angular/router": "^6.1.4",
+    "@angular/animations": "^7.2.15",
+    "@angular/cdk": "7.3.7",
+    "@angular/cli": "^7.3.5",
+    "@angular/common": "^7.2.15",
+    "@angular/core": "^7.2.15",
+    "@angular/forms": "^7.2.15",
+    "@angular/http": "^7.2.15",
+    "@angular/platform-browser": "^7.2.15",
+    "@angular/platform-browser-dynamic": "^7.2.15",
+    "@angular/platform-server": "^7.2.15",
+    "@angular/router": "^7.2.15",
     "@angularclass/bootloader": "1.0.1",
-    "@ng-bootstrap/ng-bootstrap": "^2.0.0",
-    "@ng-dynamic-forms/core": "6.2.0",
-    "@ng-dynamic-forms/ui-ng-bootstrap": "6.2.0",
-    "@ngrx/effects": "^6.1.0",
-    "@ngrx/router-store": "^6.1.0",
-    "@ngrx/store": "^6.1.0",
-    "@nguniversal/express-engine": "6.1.0",
-    "@ngx-translate/core": "10.0.2",
-    "@ngx-translate/http-loader": "3.0.1",
+    "@ng-bootstrap/ng-bootstrap": "^4.1.0",
+    "@ng-dynamic-forms/core": "^7.1.0",
+    "@ng-dynamic-forms/ui-ng-bootstrap": "^7.1.0",
+    "@ngrx/effects": "^7.3.0",
+    "@ngrx/router-store": "^7.3.0",
+    "@ngrx/store": "^7.3.0",
+    "@nguniversal/express-engine": "^7.1.1",
+    "@ngx-translate/core": "11.0.1",
+    "@ngx-translate/http-loader": "4.0.0",
     "@nicky-lenaers/ngx-scroll-to": "^1.0.0",
     "angular-idle-preload": "3.0.0",
     "angular-sortablejs": "^2.5.0",
     "angular2-text-mask": "9.0.0",
-    "angulartics2": "^6.2.0",
+    "angulartics2": "7.5.2",
     "body-parser": "1.18.2",
     "bootstrap": "4.3.1",
     "cerialize": "0.1.18",
     "compression": "1.7.1",
     "cookie-parser": "1.4.3",
-    "core-js": "^2.5.7",
+    "core-js": "^2.6.5",
     "debug-loader": "^0.0.1",
     "express": "4.16.2",
     "express-session": "1.15.6",
@@ -112,6 +114,7 @@
     "file-saver": "^1.3.8",
     "font-awesome": "4.7.0",
     "fork-ts-checker-webpack-plugin": "^0.4.10",
+    "hammerjs": "^2.0.8",
     "http-server": "0.11.1",
     "https": "1.0.0",
     "js-cookie": "2.2.0",
@@ -121,37 +124,40 @@
     "jwt-decode": "^2.2.0",
     "methods": "1.1.2",
     "moment": "^2.22.1",
+    "moment-range": "^4.0.2",
     "morgan": "^1.9.1",
-    "ng-mocks": "^6.2.1",
+    "ng-mocks": "^7.6.0",
     "ng2-file-upload": "1.2.1",
-    "ng2-nouislider": "^1.7.11",
+    "ng2-nouislider": "^1.8.2",
     "ngx-bootstrap": "^3.2.0",
     "ngx-infinite-scroll": "6.0.1",
-    "ngx-moment": "^3.1.0",
+    "ngx-moment": "^3.4.0",
     "ngx-pagination": "3.0.3",
     "nouislider": "^11.0.0",
     "pem": "1.13.2",
     "reflect-metadata": "0.1.12",
-    "rxjs": "6.2.2",
+    "rxjs": "6.4.0",
     "rxjs-spy": "^7.5.1",
     "sass-resources-loader": "^2.0.0",
     "sortablejs": "1.7.0",
     "text-mask-core": "5.0.1",
     "ts-loader": "^5.2.1",
     "ts-md5": "^1.2.4",
+    "url-parse": "^1.4.7",
     "uuid": "^3.2.1",
     "webfontloader": "1.6.28",
-    "webpack-cli": "^3.1.0",
-    "zone.js": "^0.8.26"
+    "webpack-cli": "^3.2.0",
+    "zone.js": "^0.8.29"
   },
   "devDependencies": {
-    "@angular/compiler": "^6.1.4",
-    "@angular/compiler-cli": "^6.1.4",
+    "@angular-devkit/build-angular": "^0.13.5",
+    "@angular/compiler": "^7.2.15",
+    "@angular/compiler-cli": "^7.2.15",
     "@fortawesome/fontawesome-free": "^5.5.0",
-    "@ngrx/entity": "^6.1.0",
-    "@ngrx/schematics": "^6.1.0",
-    "@ngrx/store-devtools": "^6.1.0",
-    "@ngtools/webpack": "^6.1.5",
+    "@ngrx/entity": "^7.3.0",
+    "@ngrx/schematics": "^7.3.0",
+    "@ngrx/store-devtools": "^7.3.0",
+    "@ngtools/webpack": "^7.3.9",
     "@schematics/angular": "^0.7.5",
     "@types/acorn": "^4.0.3",
     "@types/cookie-parser": "1.4.1",
@@ -160,44 +166,47 @@
     "@types/express-serve-static-core": "4.16.0",
     "@types/file-saver": "^1.3.0",
     "@types/hammerjs": "2.0.35",
-    "@types/jasmine": "^2.8.6",
+    "@types/jasmine": "^3.3.9",
     "@types/js-cookie": "2.1.0",
     "@types/json5": "^0.0.30",
     "@types/lodash": "^4.14.110",
     "@types/memory-cache": "0.2.0",
     "@types/mime": "2.0.0",
-    "@types/node": "^10.9.4",
+    "@types/node": "^11.11.2",
     "@types/serve-static": "1.13.2",
     "@types/uuid": "^3.4.3",
     "@types/webfontloader": "1.6.29",
+    "@typescript-eslint/eslint-plugin": "^2.12.0",
+    "@typescript-eslint/parser": "^2.12.0",
     "ajv": "^6.1.1",
     "ajv-keywords": "^3.1.0",
     "angular2-template-loader": "0.6.2",
     "autoprefixer": "^9.1.3",
     "caniuse-lite": "^1.0.30000697",
     "cli-progress": "^3.3.1",
-    "codelyzer": "^4.4.4",
+    "codelyzer": "^5.1.0",
     "commander": "^3.0.2",
-    "compression-webpack-plugin": "^1.1.6",
-    "copy-webpack-plugin": "^4.4.1",
+    "compression-webpack-plugin": "^3.0.1",
+    "copy-webpack-plugin": "^5.1.1",
     "copyfiles": "^2.1.1",
     "coveralls": "3.0.0",
-    "css-loader": "1.0.0",
+    "css-loader": "3.4.0",
     "cssnano": "^4.1.10",
     "deep-freeze": "0.0.1",
+    "eslint": "^6.7.2",
     "exports-loader": "^0.7.0",
-    "html-webpack-plugin": "^4.0.0-alpha",
+    "html-webpack-plugin": "3.2.0",
     "imports-loader": "0.8.0",
     "istanbul-instrumenter-loader": "3.0.1",
-    "jasmine-core": "^3.2.1",
+    "jasmine-core": "^3.3.0",
     "jasmine-marbles": "0.3.1",
     "jasmine-spec-reporter": "4.2.1",
-    "karma": "3.0.0",
+    "karma": "4.0.1",
     "karma-chrome-launcher": "2.2.0",
-    "karma-cli": "1.0.1",
+    "karma-cli": "2.0.0",
     "karma-coverage": "1.1.2",
     "karma-istanbul-preprocessor": "0.0.2",
-    "karma-jasmine": "1.1.2",
+    "karma-jasmine": "2.0.1",
     "karma-mocha-reporter": "2.2.5",
     "karma-phantomjs-launcher": "1.0.4",
     "karma-remap-coverage": "^0.1.5",
@@ -221,26 +230,26 @@
     "protractor": "^5.4.2",
     "protractor-istanbul-plugin": "2.0.0",
     "raw-loader": "0.5.1",
-    "resolve-url-loader": "^2.3.0",
     "rimraf": "2.6.2",
     "rollup": "^0.65.0",
     "rollup-plugin-commonjs": "^9.1.6",
     "rollup-plugin-node-globals": "1.2.1",
     "rollup-plugin-node-resolve": "^3.0.3",
     "rollup-plugin-terser": "^2.0.2",
-    "sass-loader": "7.1.0",
-    "script-ext-html-webpack-plugin": "2.0.1",
+    "sass-loader": "7.3.1",
+    "script-ext-html-webpack-plugin": "2.1.4",
     "source-map": "0.7.3",
     "source-map-loader": "0.2.4",
     "string-replace-loader": "^2.1.1",
+    "terser-webpack-plugin": "^2.3.1",
     "to-string-loader": "1.1.5",
     "ts-helpers": "1.1.2",
     "ts-node": "4.1.0",
     "tslint": "5.11.0",
     "typedoc": "^0.9.0",
-    "typescript": "^2.9.1",
+    "typescript": "3.1.6",
     "webdriver-manager": "^12.1.7",
-    "webpack": "^4.17.1",
+    "webpack": "^4.29.6",
     "webpack-bundle-analyzer": "^3.3.2",
     "webpack-dev-middleware": "3.2.0",
     "webpack-dev-server": "^3.1.11",
diff --git a/protractor.conf.js b/protractor.conf.js
index 2949702a0a..6570c9f7c3 100644
--- a/protractor.conf.js
+++ b/protractor.conf.js
@@ -5,7 +5,7 @@
 var SpecReporter = require('jasmine-spec-reporter').SpecReporter;
 
 exports.config = {
-  allScriptsTimeout: 11000,
+  allScriptsTimeout: 600000,
   // -----------------------------------------------------------------
   // Uncomment to run tests using a remote Selenium server
   //seleniumAddress: 'http://selenium.address:4444/wd/hub',
@@ -73,7 +73,7 @@ exports.config = {
   framework: 'jasmine',
   jasmineNodeOpts: {
     showColors: true,
-    defaultTimeoutInterval: 30000,
+    defaultTimeoutInterval: 600000,
     print: function () {}
   },
   useAllAngular2AppRoots: true,
diff --git a/resources/fonts/README.md b/resources/fonts/README.md
new file mode 100644
index 0000000000..e4817b8572
--- /dev/null
+++ b/resources/fonts/README.md
@@ -0,0 +1,3 @@
+# Supported font formats
+
+DSpace supports EOT, TTF, OTF, SVG, WOFF and WOFF2 fonts. 
diff --git a/resources/i18n/en.json5 b/resources/i18n/en.json5
index 2a6165e14c..86d93044ac 100644
--- a/resources/i18n/en.json5
+++ b/resources/i18n/en.json5
@@ -244,6 +244,8 @@
 
   "collection.create.head": "Create a Collection",
 
+  "collection.create.notifications.success": "Successfully created the Collection",
+
   "collection.create.sub-head": "Create a Collection for Community {{ parent }}",
 
   "collection.delete.cancel": "Cancel",
@@ -264,6 +266,62 @@
 
   "collection.edit.head": "Edit Collection",
 
+
+
+  "collection.edit.item-mapper.cancel": "Cancel",
+
+  "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
+
+  "collection.edit.item-mapper.confirm": "Map selected items",
+
+  "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
+
+  "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
+
+  "collection.edit.item-mapper.no-search": "Please enter a query to search",
+
+  "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
+
+  "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
+
+  "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
+
+  "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
+
+  "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
+
+  "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
+
+  "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
+
+  "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
+
+  "collection.edit.item-mapper.remove": "Remove selected item mappings",
+
+  "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
+
+  "collection.edit.item-mapper.tabs.map": "Map new items",
+
+
+
+  "collection.edit.logo.label": "Collection logo",
+
+  "collection.edit.logo.notifications.add.error": "Uploading Collection logo failed. Please verify the content before retrying.",
+
+  "collection.edit.logo.notifications.add.success": "Upload Collection logo successful.",
+
+  "collection.edit.logo.notifications.delete.success.title": "Logo deleted",
+
+  "collection.edit.logo.notifications.delete.success.content": "Successfully deleted the collection's logo",
+
+  "collection.edit.logo.notifications.delete.error.title": "Error deleting logo",
+
+  "collection.edit.logo.upload": "Drop a Collection Logo to upload",
+
+
+
+  "collection.edit.notifications.success": "Successfully edited the Collection",
+
   "collection.edit.return": "Return",
 
 
@@ -304,42 +362,6 @@
 
 
 
-  "collection.edit.item-mapper.cancel": "Cancel",
-
-  "collection.edit.item-mapper.collection": "Collection: \"<b>{{name}}</b>\"",
-
-  "collection.edit.item-mapper.confirm": "Map selected items",
-
-  "collection.edit.item-mapper.description": "This is the item mapper tool that allows collection administrators to map items from other collections into this collection. You can search for items from other collections and map them, or browse the list of currently mapped items.",
-
-  "collection.edit.item-mapper.head": "Item Mapper - Map Items from Other Collections",
-
-  "collection.edit.item-mapper.no-search": "Please enter a query to search",
-
-  "collection.edit.item-mapper.notifications.map.error.content": "Errors occurred for mapping of {{amount}} items.",
-
-  "collection.edit.item-mapper.notifications.map.error.head": "Mapping errors",
-
-  "collection.edit.item-mapper.notifications.map.success.content": "Successfully mapped {{amount}} items.",
-
-  "collection.edit.item-mapper.notifications.map.success.head": "Mapping completed",
-
-  "collection.edit.item-mapper.notifications.unmap.error.content": "Errors occurred for removing the mappings of {{amount}} items.",
-
-  "collection.edit.item-mapper.notifications.unmap.error.head": "Remove mapping errors",
-
-  "collection.edit.item-mapper.notifications.unmap.success.content": "Successfully removed the mappings of {{amount}} items.",
-
-  "collection.edit.item-mapper.notifications.unmap.success.head": "Remove mapping completed",
-
-  "collection.edit.item-mapper.remove": "Remove selected item mappings",
-
-  "collection.edit.item-mapper.tabs.browse": "Browse mapped items",
-
-  "collection.edit.item-mapper.tabs.map": "Map new items",
-
-
-
   "collection.form.abstract": "Short Description",
 
   "collection.form.description": "Introductory text (HTML)",
@@ -378,8 +400,18 @@
 
 
 
+  "communityList.tabTitle": "DSpace - Community List",
+
+  "communityList.title": "List of Communities",
+
+  "communityList.showMore": "Show More",
+
+
+
   "community.create.head": "Create a Community",
 
+  "community.create.notifications.success": "Successfully created the Community",
+
   "community.create.sub-head": "Create a Sub-Community for Community {{ parent }}",
 
   "community.delete.cancel": "Cancel",
@@ -398,8 +430,30 @@
 
   "community.edit.head": "Edit Community",
 
+
+
+  "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.success": "Upload Community logo successful.",
+
+  "community.edit.logo.notifications.delete.success.title": "Logo deleted",
+
+  "community.edit.logo.notifications.delete.success.content": "Successfully deleted the community's logo",
+
+  "community.edit.logo.notifications.delete.error.title": "Error deleting logo",
+
+  "community.edit.logo.upload": "Drop a Community Logo to upload",
+
+
+
+  "community.edit.notifications.success": "Successfully edited the Community",
+
   "community.edit.return": "Return",
 
+
+
   "community.edit.tabs.curate.head": "Curate",
 
   "community.edit.tabs.curate.title": "Community Edit - Curate",
@@ -412,6 +466,8 @@
 
   "community.edit.tabs.roles.title": "Community Edit - Roles",
 
+
+
   "community.form.abstract": "Short Description",
 
   "community.form.description": "Introductory text (HTML)",
@@ -503,6 +559,9 @@
   "footer.link.duraspace": "DuraSpace",
 
 
+  "form.add": "Add",
+
+  "form.add-help": "Click here to add the current entry and to add another one",
 
   "form.cancel": "Cancel",
 
@@ -528,6 +587,10 @@
 
   "form.loading": "Loading...",
 
+  "form.lookup": "Lookup",
+
+  "form.lookup-help": "Click here to look up an existing relation",
+
   "form.no-results": "No results found",
 
   "form.no-value": "No value entered",
@@ -768,7 +831,7 @@
 
   "item.edit.tabs.relationships.head": "Item Relationships",
 
-  "item.edit.tabs.relationships.title": "Item Edit - Relationships",
+  "item.edit.tabs.relationships.title": "Item Edit -  Relationships",
 
   "item.edit.tabs.status.buttons.authorizations.button": "Authorizations...",
 
@@ -866,9 +929,17 @@
 
   "item.page.person.search.title": "Articles by this author",
 
-  "item.page.related-items.view-more": "View more",
+  "item.page.related-items.view-more": "Show {{ amount }} more",
 
-  "item.page.related-items.view-less": "View less",
+  "item.page.related-items.view-less": "Hide last {{ amount }}",
+
+  "item.page.relationships.isAuthorOfPublication": "Publications",
+
+  "item.page.relationships.isJournalOfPublication": "Publications",
+
+  "item.page.relationships.isOrgUnitOfPerson": "Authors",
+
+  "item.page.relationships.isOrgUnitOfProject": "Research Projects",
 
   "item.page.subject": "Keywords",
 
@@ -1320,6 +1391,8 @@
 
   "project.page.titleprefix": "Research Project: ",
 
+  "project.search.results.head": "Project Search Results",
+
 
 
   "publication.listelement.badge": "Publication",
@@ -1395,6 +1468,9 @@
   "search.filters.applied.f.subject": "Subject",
 
   "search.filters.applied.f.submitter": "Submitter",
+  "search.filters.applied.f.jobTitle": "Job Title",
+  "search.filters.applied.f.birthDate.max": "End birth date",
+  "search.filters.applied.f.birthDate.min": "Start birth date",
 
 
 
@@ -1508,6 +1584,8 @@
 
   "search.results.no-results-link": "quotes around it",
 
+  "search.results.empty": "Your search returned no results.",
+
 
 
   "search.sidebar.close": "Back to results",
@@ -1563,6 +1641,85 @@
   "submission.general.save-later": "Save for later",
 
 
+  "submission.sections.describe.relationship-lookup.close": "Close",
+
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-all": "Deselect all",
+
+  "submission.sections.describe.relationship-lookup.search-tab.deselect-page": "Deselect page",
+
+  "submission.sections.describe.relationship-lookup.search-tab.loading": "Loading...",
+
+  "submission.sections.describe.relationship-lookup.search-tab.placeholder": "Search query",
+
+  "submission.sections.describe.relationship-lookup.search-tab.search": "Go",
+
+  "submission.sections.describe.relationship-lookup.search-tab.select-all": "Select all",
+
+  "submission.sections.describe.relationship-lookup.search-tab.select-page": "Select page",
+
+  "submission.sections.describe.relationship-lookup.selected": "Selected {{ size }} items",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Author": "Local Authors ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal": "Local Journals ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal Issue": "Local Journal Issues ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Journal Volume": "Local Journal Volumes ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaJournal": "Sherpa Journals ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.sherpaPublisher": "Sherpa Publishers ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.orcidV2": "ORCID ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.lcname": "LC Names ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Funding Agency": "Search for Funding Agencies",
+
+  "submission.sections.describe.relationship-lookup.search-tab.tab-title.Funding": "Search for Funding",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.tab-title": "Current Selection ({{ count }})",
+
+  "submission.sections.describe.relationship-lookup.title.Journal Issue": "Journal Issues",
+
+  "submission.sections.describe.relationship-lookup.title.Journal Volume": "Journal Volumes",
+
+  "submission.sections.describe.relationship-lookup.title.Journal": "Journals",
+
+  "submission.sections.describe.relationship-lookup.title.Author": "Authors",
+
+  "submission.sections.describe.relationship-lookup.title.Funding Agency": "Funding Agency",
+
+  "submission.sections.describe.relationship-lookup.title.Funding": "Funding",
+
+  "submission.sections.describe.relationship-lookup.search-tab.toggle-dropdown": "Toggle dropdown",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.settings": "Settings",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.no-selection": "Your selection is currently empty.",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Author": "Selected Authors",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal": "Selected Journals",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal Volume": "Selected Journal Volume",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.Journal Issue": "Selected Issue",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaJournal": "Search Results",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.sherpaPublisher": "Search Results",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.orcidV2": "Search Results",
+
+  "submission.sections.describe.relationship-lookup.selection-tab.title.lcname": "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.",
+
+  "submission.sections.describe.relationship-lookup.name-variant.notification.confirm": "Save a new name variant",
+
+  "submission.sections.describe.relationship-lookup.name-variant.notification.decline": "Use only for this submission",
 
   "submission.sections.general.add-more": "Add more",
 
@@ -1732,7 +1889,7 @@
 
   "uploader.drag-message": "Drag & Drop your files here",
 
-  "uploader.or": ", or",
+  "uploader.or": ", or ",
 
   "uploader.processing": "Processing",
 
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 cb7aa1ef91..ec4003c108 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
@@ -5,7 +5,7 @@ import { PaginatedList } from '../../../core/data/paginated-list';
 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 { FindAllOptions } from '../../../core/data/request.models';
+import { FindListOptions } from '../../../core/data/request.models';
 import { map, switchMap, take } from 'rxjs/operators';
 import { hasValue } from '../../../shared/empty.util';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -35,7 +35,7 @@ export class BitstreamFormatsComponent implements OnInit {
    * The current pagination configuration for the page used by the FindAll method
    * Currently simply renders all bitstream formats
    */
-  config: FindAllOptions = Object.assign(new FindAllOptions(), {
+  config: FindListOptions = Object.assign(new FindListOptions(), {
     elementsPerPage: 20
   });
 
@@ -145,7 +145,7 @@ export class BitstreamFormatsComponent implements OnInit {
    * @param event The page change event
    */
   onPageChange(event) {
-    this.config = Object.assign(new FindAllOptions(), this.config, {
+    this.config = Object.assign(new FindListOptions(), this.config, {
       currentPage: event,
     });
     this.pageConfig.currentPage = event;
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 4a5e301921..674ae739d8 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,7 +1,6 @@
 import { MetadataRegistryComponent } from './metadata-registry.component';
 import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { TranslateModule } from '@ngx-translate/core';
 import { By } from '@angular/platform-browser';
@@ -18,6 +17,7 @@ import { NotificationsService } from '../../../shared/notifications/notification
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 import { RestResponse } from '../../../core/cache/response.models';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
+import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 
 describe('MetadataRegistryComponent', () => {
   let comp: MetadataRegistryComponent;
@@ -101,12 +101,12 @@ describe('MetadataRegistryComponent', () => {
 
     it('should start editing the selected schema', async(() => {
       fixture.whenStable().then(() => {
-        expect(registryService.editMetadataSchema).toHaveBeenCalledWith(mockSchemasList[0]);
+        expect(registryService.editMetadataSchema).toHaveBeenCalledWith(mockSchemasList[0] as MetadataSchema);
       });
     }));
 
     it('should cancel editing the selected schema when clicked again', async(() => {
-      spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(mockSchemasList[0]));
+      spyOn(registryService, 'getActiveMetadataSchema').and.returnValue(observableOf(mockSchemasList[0] as MetadataSchema));
       spyOn(registryService, 'cancelEditMetadataSchema');
       row.click();
       fixture.detectChanges();
@@ -121,7 +121,7 @@ describe('MetadataRegistryComponent', () => {
 
     beforeEach(() => {
       spyOn(registryService, 'deleteMetadataSchema').and.callThrough();
-      spyOn(registryService, 'getSelectedMetadataSchemas').and.returnValue(observableOf(selectedSchemas));
+      spyOn(registryService, 'getSelectedMetadataSchemas').and.returnValue(observableOf(selectedSchemas as MetadataSchema[]));
       comp.deleteSchemas();
       fixture.detectChanges();
     });
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 e23a9691c4..e0b0ef25a5 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,7 +1,6 @@
 import { MetadataSchemaComponent } from './metadata-schema.component';
 import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
 import { of as observableOf } from 'rxjs';
-import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { TranslateModule } from '@ngx-translate/core';
 import { CommonModule } from '@angular/common';
@@ -22,6 +21,7 @@ import { NotificationsServiceStub } from '../../../shared/testing/notifications-
 import { RestResponse } from '../../../core/cache/response.models';
 import { MetadataSchema } from '../../../core/metadata/metadata-schema.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
+import { MetadataField } from '../../../core/metadata/metadata-field.model';
 
 describe('MetadataSchemaComponent', () => {
   let comp: MetadataSchemaComponent;
@@ -152,12 +152,12 @@ describe('MetadataSchemaComponent', () => {
 
     it('should start editing the selected field', async(() => {
       fixture.whenStable().then(() => {
-        expect(registryService.editMetadataField).toHaveBeenCalledWith(mockFieldsList[2]);
+        expect(registryService.editMetadataField).toHaveBeenCalledWith(mockFieldsList[2] as MetadataField);
       });
     }));
 
     it('should cancel editing the selected field when clicked again', async(() => {
-      spyOn(registryService, 'getActiveMetadataField').and.returnValue(observableOf(mockFieldsList[2]));
+      spyOn(registryService, 'getActiveMetadataField').and.returnValue(observableOf(mockFieldsList[2] as MetadataField));
       spyOn(registryService, 'cancelEditMetadataField');
       row.click();
       fixture.detectChanges();
@@ -172,7 +172,7 @@ describe('MetadataSchemaComponent', () => {
 
     beforeEach(() => {
       spyOn(registryService, 'deleteMetadataField').and.callThrough();
-      spyOn(registryService, 'getSelectedMetadataFields').and.returnValue(observableOf(selectedFields));
+      spyOn(registryService, 'getSelectedMetadataFields').and.returnValue(observableOf(selectedFields as MetadataField[]));
       comp.deleteFields();
       fixture.detectChanges();
     });
diff --git a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
index 3ad1bd4272..72eb306bf1 100644
--- a/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
+++ b/src/app/+admin/admin-sidebar/admin-sidebar.component.ts
@@ -13,11 +13,11 @@ import { combineLatest as combineLatestObservable } from 'rxjs';
 import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { OnClickMenuItemModel } from '../../shared/menu/menu-item/models/onclick.model';
 import { CreateCommunityParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-community-parent-selector/create-community-parent-selector.component';
-import { CreateItemParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
 import { CreateCollectionParentSelectorComponent } from '../../shared/dso-selector/modal-wrappers/create-collection-parent-selector/create-collection-parent-selector.component';
 import { EditItemSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-item-selector/edit-item-selector.component';
 import { EditCommunitySelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-community-selector/edit-community-selector.component';
 import { EditCollectionSelectorComponent } from '../../shared/dso-selector/modal-wrappers/edit-collection-selector/edit-collection-selector.component';
+import {CreateItemParentSelectorComponent} from '../../shared/dso-selector/modal-wrappers/create-item-parent-selector/create-item-parent-selector.component';
 
 /**
  * Component representing the admin sidebar
@@ -138,18 +138,18 @@ export class AdminSidebarComponent extends MenuComponent implements OnInit {
         parentID: 'new',
         active: false,
         visible: true,
-        // model: {
-        //   type: MenuItemType.ONCLICK,
-        //   text: 'menu.section.new_item',
-        //   function: () => {
-        //     this.modalService.open(CreateItemParentSelectorComponent);
-        //   }
-        // } as OnClickMenuItemModel,
         model: {
-          type: MenuItemType.LINK,
+          type: MenuItemType.ONCLICK,
           text: 'menu.section.new_item',
-          link: '/submit'
-        } as LinkMenuItemModel,
+          function: () => {
+            this.modalService.open(CreateItemParentSelectorComponent);
+          }
+        } as OnClickMenuItemModel,
+        // model: {
+        //   type: MenuItemType.LINK,
+        //   text: 'menu.section.new_item',
+        //   link: '/submit'
+        // } as LinkMenuItemModel,
       },
       {
         id: 'new_item_version',
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 21b494f41f..59433e49a0 100644
--- a/src/app/+collection-page/collection-form/collection-form.component.ts
+++ b/src/app/+collection-page/collection-form/collection-form.component.ts
@@ -1,9 +1,19 @@
 import { Component, Input } from '@angular/core';
-import { DynamicInputModel, DynamicTextAreaModel } from '@ng-dynamic-forms/core';
-import { DynamicFormControlModel } from '@ng-dynamic-forms/core/src/model/dynamic-form-control.model';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+  DynamicInputModel,
+  DynamicTextAreaModel
+} from '@ng-dynamic-forms/core';
 import { Collection } from '../../core/shared/collection.model';
 import { ComColFormComponent } from '../../shared/comcol-forms/comcol-form/comcol-form.component';
-import { NormalizedCollection } from '../../core/cache/models/normalized-collection.model';
+import { Location } from '@angular/common';
+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';
 
 /**
  * Form used for creating and editing collections
@@ -22,7 +32,7 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> {
   /**
    * @type {Collection.type} This is a collection-type form
    */
-  protected type = Collection.type;
+  type = Collection.type;
 
   /**
    * The dynamic form fields used for creating/editing a collection
@@ -65,4 +75,15 @@ export class CollectionFormComponent extends ComColFormComponent<Collection> {
       name: 'dc.description.provenance',
     }),
   ];
+
+  public constructor(protected location: Location,
+                     protected formService: DynamicFormService,
+                     protected translate: TranslateService,
+                     protected notificationsService: NotificationsService,
+                     protected authService: AuthService,
+                     protected dsoService: CommunityDataService,
+                     protected requestService: RequestService,
+                     protected objectCache: ObjectCacheService) {
+    super(location, formService, translate, notificationsService, authService, requestService, objectCache);
+  }
 }
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 0bbfb30821..62a8d8dabb 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,29 +1,23 @@
 import { CollectionItemMapperComponent } from './collection-item-mapper.component';
-import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 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 { SearchPageModule } from '../../+search-page/search-page.module';
-import { ObjectCollectionComponent } from '../../shared/object-collection/object-collection.component';
 import { ActivatedRoute, Router } from '@angular/router';
 import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
 import { RouterStub } from '../../shared/testing/router-stub';
-import { SearchConfigurationService } from '../../+search-page/search-service/search-configuration.service';
-import { SearchService } from '../../+search-page/search-service/search.service';
 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 { SharedModule } from '../../shared/shared.module';
 import { Collection } from '../../core/shared/collection.model';
 import { RemoteData } from '../../core/data/remote-data';
-import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { EventEmitter, NgModule } from '@angular/core';
+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';
@@ -36,13 +30,14 @@ import { ItemSelectComponent } from '../../shared/object-select/item-select/item
 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 { Observable } from 'rxjs/internal/Observable';
 import { of as observableOf, of } from 'rxjs/internal/observable/of';
 import { RestResponse } from '../../core/cache/response.models';
-import { SearchFixedFilterService } from '../../+search-page/search-filters/search-filter/search-fixed-filter.service';
 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/paginated-search-options.model';
 
 describe('CollectionItemMapperComponent', () => {
   let comp: CollectionItemMapperComponent;
@@ -135,7 +130,6 @@ describe('CollectionItemMapperComponent', () => {
         { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
         { provide: ObjectSelectService, useValue: new ObjectSelectServiceStub() },
         { provide: RouteService, useValue: routeServiceStub },
-        { provide: SearchFixedFilterService, useValue: fixedFilterServiceStub }
       ]
     }).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 750578cc35..5c67a78401 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
@@ -5,12 +5,9 @@ import { fadeIn, fadeInOut } from '../../shared/animations/fade';
 import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../core/data/remote-data';
 import { Collection } from '../../core/shared/collection.model';
-import { SearchConfigurationService } from '../../+search-page/search-service/search-configuration.service';
-import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
 import { PaginatedList } from '../../core/data/paginated-list';
-import { map, startWith, switchMap, take, tap } from 'rxjs/operators';
+import { map, startWith, switchMap, take } from 'rxjs/operators';
 import { getRemoteDataPayload, getSucceededRemoteData, toDSpaceObjectListRD } from '../../core/shared/operators';
-import { SearchService } from '../../+search-page/search-service/search.service';
 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';
@@ -22,6 +19,9 @@ import { isNotEmpty } from '../../shared/empty.util';
 import { RestResponse } from '../../core/cache/response.models';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
 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/paginated-search-options.model';
+import { SearchService } from '../../core/shared/search/search.service';
 
 @Component({
   selector: 'ds-collection-item-mapper',
diff --git a/src/app/+collection-page/collection-page.component.html b/src/app/+collection-page/collection-page.component.html
index 436cd351a0..98552ed40b 100644
--- a/src/app/+collection-page/collection-page.component.html
+++ b/src/app/+collection-page/collection-page.component.html
@@ -3,16 +3,19 @@
          *ngVar="(collectionRD$ | async) as collectionRD">
         <div *ngIf="collectionRD?.hasSucceeded" @fadeInOut>
             <div *ngIf="collectionRD?.payload as collection">
+                <ds-view-tracker [object]="collection"></ds-view-tracker>
                 <header class="comcol-header border-bottom mb-4 pb-4">
-                    <!-- Collection logo -->
-                    <ds-comcol-page-logo *ngIf="logoRD$"
-                        [logo]="(logoRD$ | async)?.payload" [alternateText]="'Collection Logo'">
-                        [alternateText]="'Collection Logo'">
-                    </ds-comcol-page-logo>
-                <!-- Collection Name -->
+                  <!-- Collection Name -->
                 <ds-comcol-page-header
                         [name]="collection.name">
                 </ds-comcol-page-header>
+                    <!-- Collection logo -->
+                    <ds-comcol-page-logo *ngIf="logoRD$"
+                                     [logo]="(logoRD$ | async)?.payload"
+                                     [alternateText]="'Collection Logo'"
+                        [alternateText]="'Collection Logo'">
+                    </ds-comcol-page-logo>
+
                  <!-- Handle -->
                 <ds-comcol-page-handle
                         [content]="collection.handle"
diff --git a/src/app/+collection-page/collection-page.component.ts b/src/app/+collection-page/collection-page.component.ts
index 41afbf2115..4866cf3b60 100644
--- a/src/app/+collection-page/collection-page.component.ts
+++ b/src/app/+collection-page/collection-page.component.ts
@@ -2,8 +2,8 @@ import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { BehaviorSubject, of as observableOf, Observable, Subject } from 'rxjs';
 import { filter, flatMap, map, startWith, switchMap, take, tap } from 'rxjs/operators';
-import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
-import { SearchService } from '../+search-page/search-service/search.service';
+import { PaginatedSearchOptions } from '../shared/search/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';
diff --git a/src/app/+collection-page/collection-page.module.ts b/src/app/+collection-page/collection-page.module.ts
index c8d0a3b6ea..554d56815a 100644
--- a/src/app/+collection-page/collection-page.module.ts
+++ b/src/app/+collection-page/collection-page.module.ts
@@ -8,17 +8,18 @@ import { CollectionPageRoutingModule } from './collection-page-routing.module';
 import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
 import { CollectionFormComponent } from './collection-form/collection-form.component';
 import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
-import { SearchService } from '../+search-page/search-service/search.service';
 import { EditItemTemplatePageComponent } from './edit-item-template-page/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 { SearchFixedFilterService } from '../+search-page/search-filters/search-filter/search-fixed-filter.service';
+import { SearchService } from '../core/shared/search/search.service';
+import { StatisticsModule } from '../statistics/statistics.module';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
     CollectionPageRoutingModule,
+    StatisticsModule.forRoot(),
     EditItemPageModule
   ],
   declarations: [
@@ -34,7 +35,6 @@ import { SearchFixedFilterService } from '../+search-page/search-filters/search-
   ],
   providers: [
     SearchService,
-    SearchFixedFilterService
   ]
 })
 export class CollectionPageModule {
diff --git a/src/app/+collection-page/create-collection-page/create-collection-page.component.html b/src/app/+collection-page/create-collection-page/create-collection-page.component.html
index b3f4361bc6..800d285846 100644
--- a/src/app/+collection-page/create-collection-page/create-collection-page.component.html
+++ b/src/app/+collection-page/create-collection-page/create-collection-page.component.html
@@ -4,5 +4,5 @@
             <h2 id="sub-header" class="border-bottom pb-2">{{'collection.create.sub-head' | translate:{ parent: (parentRD$| async)?.payload.name } }}</h2>
         </div>
     </div>
-    <ds-collection-form (submitForm)="onSubmit($event)"></ds-collection-form>
+    <ds-collection-form (submitForm)="onSubmit($event)" (finish)="navigateToNewPage()"></ds-collection-form>
 </div>
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 e223b11c65..869a89d5e0 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
@@ -10,6 +10,8 @@ import { CollectionDataService } from '../../core/data/collection-data.service';
 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';
 
 describe('CreateCollectionPageComponent', () => {
   let comp: CreateCollectionPageComponent;
@@ -27,6 +29,7 @@ describe('CreateCollectionPageComponent', () => {
         },
         { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } },
         { provide: Router, useValue: {} },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
       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 2cab36d285..ae31b94c3d 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
@@ -5,6 +5,8 @@ import { Router } from '@angular/router';
 import { CreateComColPageComponent } from '../../shared/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';
 
 /**
  * Component that represents the page where a user can create a new Collection
@@ -16,13 +18,16 @@ import { CollectionDataService } from '../../core/data/collection-data.service';
 })
 export class CreateCollectionPageComponent extends CreateComColPageComponent<Collection> {
   protected frontendURL = '/collections/';
+  protected type = Collection.type;
 
   public constructor(
     protected communityDataService: CommunityDataService,
     protected collectionDataService: CollectionDataService,
     protected routeService: RouteService,
-    protected router: Router
+    protected router: Router,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService
   ) {
-    super(collectionDataService, communityDataService, routeService, router);
+    super(collectionDataService, communityDataService, routeService, router, notificationsService, translate);
   }
 }
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 d627f7e8ef..b4eaf46bfb 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
@@ -16,7 +16,9 @@
     </button>
   </div>
 </div>
-<ds-collection-form (submitForm)="onSubmit($event)" [dso]="(dsoRD$ | async)?.payload"></ds-collection-form>
+<ds-collection-form (submitForm)="onSubmit($event)"
+                    [dso]="(dsoRD$ | async)?.payload"
+                    (finish)="navigateToHomePage()"></ds-collection-form>
 <a class="btn btn-danger"
    [routerLink]="'/collections/' + (dsoRD$ | async)?.payload.uuid + '/delete'">{{'collection.edit.delete'
   | translate}}</a>
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 2bd932b7d2..a4336201fc 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
@@ -8,10 +8,10 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 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 { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
 import { ItemTemplateDataService } from '../../../core/data/item-template-data.service';
-import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { Collection } from '../../../core/shared/collection.model';
 
 describe('CollectionMetadataComponent', () => {
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 a46c4189bb..72ebbb8508 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
@@ -22,6 +22,7 @@ import { TranslateService } from '@ngx-translate/core';
 })
 export class CollectionMetadataComponent extends ComcolMetadataComponent<Collection> {
   protected frontendURL = '/collections/';
+  protected type = Collection.type;
 
   /**
    * The collection's item template
@@ -36,7 +37,7 @@ export class CollectionMetadataComponent extends ComcolMetadataComponent<Collect
     protected notificationsService: NotificationsService,
     protected translate: TranslateService
   ) {
-    super(collectionDataService, router, route);
+    super(collectionDataService, router, route, notificationsService, translate);
   }
 
   ngOnInit(): void {
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 21671fe112..209ce5149a 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
@@ -12,7 +12,7 @@ import { getCollectionPageRoute } from '../collection-page-routing.module';
   templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
 })
 export class EditCollectionPageComponent extends EditComColPageComponent<Collection> {
-  protected type = 'collection';
+  type = 'collection';
 
   public constructor(
     protected router: Router,
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 17d601e251..e9bd2f66c8 100644
--- a/src/app/+community-page/community-form/community-form.component.ts
+++ b/src/app/+community-page/community-form/community-form.component.ts
@@ -1,9 +1,19 @@
 import { Component, Input } from '@angular/core';
-import { DynamicInputModel, DynamicTextAreaModel } from '@ng-dynamic-forms/core';
-import { DynamicFormControlModel } from '@ng-dynamic-forms/core/src/model/dynamic-form-control.model';
+import {
+  DynamicFormControlModel,
+  DynamicFormService,
+  DynamicInputModel,
+  DynamicTextAreaModel
+} from '@ng-dynamic-forms/core';
 import { Community } from '../../core/shared/community.model';
-import { ResourceType } from '../../core/shared/resource-type';
 import { ComColFormComponent } from '../../shared/comcol-forms/comcol-form/comcol-form.component';
+import { Location } from '@angular/common';
+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';
 
 /**
  * Form used for creating and editing communities
@@ -22,7 +32,7 @@ export class CommunityFormComponent extends ComColFormComponent<Community> {
   /**
    * @type {Community.type} This is a community-type form
    */
-  protected type = Community.type;
+  type = Community.type;
 
   /**
    * The dynamic form fields used for creating/editing a community
@@ -57,4 +67,15 @@ export class CommunityFormComponent extends ComColFormComponent<Community> {
       name: 'dc.description.tableofcontents',
     }),
   ];
+
+  public constructor(protected location: Location,
+                     protected formService: DynamicFormService,
+                     protected translate: TranslateService,
+                     protected notificationsService: NotificationsService,
+                     protected authService: AuthService,
+                     protected dsoService: CommunityDataService,
+                     protected requestService: RequestService,
+                     protected objectCache: ObjectCacheService) {
+    super(location, formService, translate, notificationsService, authService, requestService, objectCache);
+  }
 }
diff --git a/src/app/+community-page/community-page.component.html b/src/app/+community-page/community-page.component.html
index 05d0bd1d0e..dfd1ce93d9 100644
--- a/src/app/+community-page/community-page.component.html
+++ b/src/app/+community-page/community-page.component.html
@@ -1,13 +1,13 @@
 <div class="container" *ngVar="(communityRD$ | async) as communityRD">
   <div class="community-page" *ngIf="communityRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="communityRD?.payload; let communityPayload">
+      <ds-view-tracker [object]="communityPayload"></ds-view-tracker>
       <header class="comcol-header border-bottom mb-4 pb-4">
+        <!-- Community name -->
+        <ds-comcol-page-header [name]="communityPayload.name"></ds-comcol-page-header>
         <!-- Community logo -->
         <ds-comcol-page-logo *ngIf="logoRD$" [logo]="(logoRD$ | async)?.payload" [alternateText]="'Community Logo'">
         </ds-comcol-page-logo>
-
-        <!-- Community name -->
-        <ds-comcol-page-header [name]="communityPayload.name"></ds-comcol-page-header>
         <!-- Handle -->
         <ds-comcol-page-handle [content]="communityPayload.handle" [title]="'community.page.handle'">
         </ds-comcol-page-handle>
diff --git a/src/app/+community-page/community-page.module.ts b/src/app/+community-page/community-page.module.ts
index 534c96989e..1228783c3b 100644
--- a/src/app/+community-page/community-page.module.ts
+++ b/src/app/+community-page/community-page.module.ts
@@ -6,16 +6,18 @@ 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 { CommunityPageSubCommunityListComponent } from './sub-community-list/community-page-sub-community-list.component';
 import { CreateCommunityPageComponent } from './create-community-page/create-community-page.component';
 import { CommunityFormComponent } from './community-form/community-form.component';
 import { DeleteCommunityPageComponent } from './delete-community-page/delete-community-page.component';
+import { StatisticsModule } from '../statistics/statistics.module';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
-    CommunityPageRoutingModule
+    CommunityPageRoutingModule,
+    StatisticsModule.forRoot()
   ],
   declarations: [
     CommunityPageComponent,
diff --git a/src/app/+community-page/create-community-page/create-community-page.component.html b/src/app/+community-page/create-community-page/create-community-page.component.html
index 55a080d2a1..4f75771f6d 100644
--- a/src/app/+community-page/create-community-page/create-community-page.component.html
+++ b/src/app/+community-page/create-community-page/create-community-page.component.html
@@ -7,5 +7,5 @@
       </ng-container>
     </div>
   </div>
-  <ds-community-form (submitForm)="onSubmit($event)"></ds-community-form>
+  <ds-community-form (submitForm)="onSubmit($event)" (finish)="navigateToNewPage()"></ds-community-form>
 </div>
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 dead5a5c3b..d0de8ec71c 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
@@ -10,6 +10,8 @@ import { CollectionDataService } from '../../core/data/collection-data.service';
 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';
 
 describe('CreateCommunityPageComponent', () => {
   let comp: CreateCommunityPageComponent;
@@ -23,6 +25,7 @@ describe('CreateCommunityPageComponent', () => {
         { provide: CommunityDataService, useValue: { findById: () => observableOf({}) } },
         { provide: RouteService, useValue: { getQueryParameterValue: () => observableOf('1234') } },
         { provide: Router, useValue: {} },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
       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 fd5f18442a..30a2acbb0d 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
@@ -4,6 +4,8 @@ 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-forms/create-comcol-page/create-comcol-page.component';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
 
 /**
  * Component that represents the page where a user can create a new Community
@@ -15,12 +17,15 @@ import { CreateComColPageComponent } from '../../shared/comcol-forms/create-comc
 })
 export class CreateCommunityPageComponent extends CreateComColPageComponent<Community> {
   protected frontendURL = '/communities/';
+  protected type = Community.type;
 
   public constructor(
     protected communityDataService: CommunityDataService,
     protected routeService: RouteService,
-    protected router: Router
+    protected router: Router,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService
   ) {
-    super(communityDataService, communityDataService, routeService, router);
+    super(communityDataService, communityDataService, routeService, router, notificationsService, translate);
   }
 }
diff --git a/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html b/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html
index 9a59be9067..6b441dbabd 100644
--- a/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html
+++ b/src/app/+community-page/edit-community-page/community-metadata/community-metadata.component.html
@@ -1,4 +1,6 @@
-<ds-community-form (submitForm)="onSubmit($event)" [dso]="(dsoRD$ | async)?.payload"></ds-community-form>
+<ds-community-form (submitForm)="onSubmit($event)"
+                   [dso]="(dsoRD$ | async)?.payload"
+                   (finish)="navigateToHomePage()"></ds-community-form>
 <a class="btn btn-danger"
    [routerLink]="'/communities/' + (dsoRD$ | async)?.payload.uuid + '/delete'">{{'community.edit.delete'
   | translate}}</a>
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 52ee73bfab..abeafb4e23 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
@@ -8,6 +8,8 @@ import { of as observableOf } from 'rxjs/internal/observable/of';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { CommunityMetadataComponent } from './community-metadata.component';
 import { CommunityDataService } from '../../../core/data/community-data.service';
+import { NotificationsService } from '../../../shared/notifications/notifications.service';
+import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 
 describe('CommunityMetadataComponent', () => {
   let comp: CommunityMetadataComponent;
@@ -20,6 +22,7 @@ describe('CommunityMetadataComponent', () => {
       providers: [
         { provide: CommunityDataService, useValue: {} },
         { provide: ActivatedRoute, useValue: { parent: { data: observableOf({ dso: { payload: {} } }) } } },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
       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 c57c74175d..c4bb88289f 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
@@ -3,6 +3,8 @@ import { ComcolMetadataComponent } from '../../../shared/comcol-forms/edit-comco
 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 { TranslateService } from '@ngx-translate/core';
 
 /**
  * Component for editing a community's metadata
@@ -13,12 +15,15 @@ import { CommunityDataService } from '../../../core/data/community-data.service'
 })
 export class CommunityMetadataComponent extends ComcolMetadataComponent<Community> {
   protected frontendURL = '/communities/';
+  protected type = Community.type;
 
   public constructor(
     protected communityDataService: CommunityDataService,
     protected router: Router,
-    protected route: ActivatedRoute
+    protected route: ActivatedRoute,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService
   ) {
-    super(communityDataService, router, route);
+    super(communityDataService, router, route, notificationsService, translate);
   }
 }
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 a8d4d32b7d..c0adfe0ff1 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
@@ -12,7 +12,7 @@ import { getCommunityPageRoute } from '../community-page-routing.module';
   templateUrl: '../../shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.html'
 })
 export class EditCommunityPageComponent extends EditComColPageComponent<Community> {
-  protected type = 'community';
+  type = 'community';
 
   public constructor(
     protected router: Router,
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 527b3c018f..1182db2de1 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
@@ -27,7 +27,10 @@ import { CommunityCurateComponent } from './community-curate/community-curate.co
           {
             path: 'metadata',
             component: CommunityMetadataComponent,
-            data: { title: 'community.edit.tabs.metadata.title' }
+            data: {
+              title: 'community.edit.tabs.metadata.title',
+              hideReturnButton: true
+            }
           },
           {
             path: 'roles',
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
index 9156a99b18..bf6ce7fd57 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.html
@@ -1,14 +1,13 @@
 <ng-container *ngVar="(subCollectionsRDObs | async) as subCollectionsRD">
   <div *ngIf="subCollectionsRD?.hasSucceeded && subCollectionsRD?.payload.totalElements > 0" @fadeIn>
     <h2>{{'community.sub-collection-list.head' | translate}}</h2>
-    <ul>
-      <li *ngFor="let collection of subCollectionsRD?.payload.page">
-        <p>
-          <span class="lead"><a [routerLink]="['/collections', collection.id]">{{collection.name}}</a></span><br>
-          <span class="text-muted">{{collection.shortDescription}}</span>
-        </p>
-      </li>
-    </ul>
+    <ds-viewable-collection
+      [config]="config"
+      [sortConfig]="sortConfig"
+      [objects]="subCollectionsRD"
+      [hideGear]="false"
+      (paginationChange)="onPaginationChange($event)">
+    </ds-viewable-collection>
   </div>
   <ds-error *ngIf="subCollectionsRD?.hasFailed" message="{{'error.sub-collections' | translate}}"></ds-error>
   <ds-loading *ngIf="subCollectionsRD?.isLoading" message="{{'loading.sub-collections' | translate}}"></ds-loading>
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
new file mode 100644
index 0000000000..09332dda16
--- /dev/null
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.spec.ts
@@ -0,0 +1,182 @@
+import { async, ComponentFixture, TestBed } 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 { FindListOptions } from '../../core/data/request.models';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { PaginatedList } from '../../core/data/paginated-list';
+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';
+
+describe('CommunityPageSubCollectionList Component', () => {
+  let comp: CommunityPageSubCollectionListComponent;
+  let fixture: ComponentFixture<CommunityPageSubCollectionListComponent>;
+  let collectionDataServiceStub: any;
+  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$(new PaginatedList(new PageInfo(), subCollList.slice(startPageIndex, endPageIndex)));
+
+    }
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        SharedModule,
+        RouterTestingModule.withRoutes([]),
+        NgbModule.forRoot(),
+        NoopAnimationsModule
+      ],
+      declarations: [CommunityPageSubCollectionListComponent],
+      providers: [
+        { provide: CollectionDataService, useValue: collectionDataServiceStub },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: SelectableListService, useValue: {} },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityPageSubCollectionListComponent);
+    comp = fixture.componentInstance;
+    comp.community = mockCommunity;
+  });
+
+  it('should display a list of collections', () => {
+    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);
+  });
+
+  it('should update list of collections on pagination change', () => {
+    subCollList = collections;
+    fixture.detectChanges();
+
+    const pagination = Object.create({
+      pagination:{
+        id: comp.pageId,
+        currentPage: 2,
+        pageSize: 5
+      },
+      sort: {
+        field: 'dc.title',
+        direction: 'ASC'
+      }
+    });
+    comp.onPaginationChange(pagination);
+    fixture.detectChanges();
+
+    const collList = fixture.debugElement.queryAll(By.css('li'));
+    expect(collList.length).toEqual(2);
+    expect(collList[0].nativeElement.textContent).toContain('Collection 6');
+    expect(collList[1].nativeElement.textContent).toContain('Collection 7');
+  });
+});
diff --git a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
index b8a5d60002..64c274444e 100644
--- a/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
+++ b/src/app/+community-page/sub-collection-list/community-page-sub-collection-list.component.ts
@@ -1,12 +1,16 @@
 import { Component, Input, OnInit } from '@angular/core';
-import { Observable } from 'rxjs';
+
+import { BehaviorSubject } from 'rxjs';
+import { take } from 'rxjs/operators';
 
 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';
+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';
 
 @Component({
   selector: 'ds-community-page-sub-collection-list',
@@ -16,9 +20,60 @@ import { PaginatedList } from '../../core/data/paginated-list';
 })
 export class CommunityPageSubCollectionListComponent implements OnInit {
   @Input() community: Community;
-  subCollectionsRDObs: Observable<RemoteData<PaginatedList<Collection>>>;
+
+  /**
+   * The pagination configuration
+   */
+  config: PaginationComponentOptions;
+
+  /**
+   * The pagination id
+   */
+  pageId = 'community-collections-pagination';
+
+  /**
+   * The sorting configuration
+   */
+  sortConfig: SortOptions;
+
+  /**
+   * A list of remote data objects of communities' collections
+   */
+  subCollectionsRDObs: BehaviorSubject<RemoteData<PaginatedList<Collection>>> = new BehaviorSubject<RemoteData<PaginatedList<Collection>>>({} as any);
+
+  constructor(private cds: CollectionDataService) {}
 
   ngOnInit(): void {
-    this.subCollectionsRDObs = this.community.collections;
+    this.config = new PaginationComponentOptions();
+    this.config.id = this.pageId;
+    this.config.pageSize = 5;
+    this.config.currentPage = 1;
+    this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
+    this.updatePage();
+  }
+
+  /**
+   * Called when one of the pagination settings is changed
+   * @param event The new pagination data
+   */
+  onPaginationChange(event) {
+    this.config.currentPage = event.pagination.currentPage;
+    this.config.pageSize = event.pagination.pageSize;
+    this.sortConfig.field = event.sort.field;
+    this.sortConfig.direction = event.sort.direction;
+    this.updatePage();
+  }
+
+  /**
+   * Update the list of collections
+   */
+  updatePage() {
+    this.cds.findByParent(this.community.id,{
+      currentPage: this.config.currentPage,
+      elementsPerPage: this.config.pageSize,
+      sort: { field: this.sortConfig.field, direction: this.sortConfig.direction }
+    }).pipe(take(1)).subscribe((results) => {
+      this.subCollectionsRDObs.next(results);
+    });
   }
 }
diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html
index 6cd62ba48d..880ea9cc8e 100644
--- a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html
+++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.html
@@ -1,14 +1,13 @@
 <ng-container *ngVar="(subCommunitiesRDObs | async) as subCommunitiesRD">
   <div *ngIf="subCommunitiesRD?.hasSucceeded && subCommunitiesRD?.payload.totalElements > 0" @fadeIn>
     <h2>{{'community.sub-community-list.head' | translate}}</h2>
-    <ul>
-      <li *ngFor="let community of subCommunitiesRD?.payload.page">
-        <p>
-          <span class="lead"><a [routerLink]="['/communities', community.id]">{{community.name}}</a></span><br>
-          <span class="text-muted">{{community.shortDescription}}</span>
-        </p>
-      </li>
-    </ul>
+    <ds-viewable-collection
+      [config]="config"
+      [sortConfig]="sortConfig"
+      [objects]="subCommunitiesRD"
+      [hideGear]="false"
+      (paginationChange)="onPaginationChange($event)">
+    </ds-viewable-collection>
   </div>
   <ds-error *ngIf="subCommunitiesRD?.hasFailed" message="{{'error.sub-communities' | translate}}"></ds-error>
   <ds-loading *ngIf="subCommunitiesRD?.isLoading" message="{{'loading.sub-communities' | translate}}"></ds-loading>
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
index 2feaa3afa6..41502e7bd4 100644
--- 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
@@ -1,21 +1,29 @@
-import {async, ComponentFixture, TestBed} from '@angular/core/testing';
-import {TranslateModule} from '@ngx-translate/core';
-import {NO_ERRORS_SCHEMA} from '@angular/core';
-import {CommunityPageSubCommunityListComponent} from './community-page-sub-community-list.component';
-import {Community} from '../../core/shared/community.model';
-import {RemoteData} from '../../core/data/remote-data';
-import {PaginatedList} from '../../core/data/paginated-list';
-import {PageInfo} from '../../core/shared/page-info.model';
-import {SharedModule} from '../../shared/shared.module';
-import {RouterTestingModule} from '@angular/router/testing';
-import {NoopAnimationsModule} from '@angular/platform-browser/animations';
-import {By} from '@angular/platform-browser';
-import {of as observableOf,  Observable } from 'rxjs';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { async, ComponentFixture, TestBed } 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';
 
-describe('SubCommunityList Component', () => {
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+
+import { CommunityPageSubCommunityListComponent } from './community-page-sub-community-list.component';
+import { Community } from '../../core/shared/community.model';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { SharedModule } from '../../shared/shared.module';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { FindListOptions } from '../../core/data/request.models';
+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';
+
+describe('CommunityPageSubCommunityListComponent Component', () => {
   let comp: CommunityPageSubCommunityListComponent;
   let fixture: ComponentFixture<CommunityPageSubCommunityListComponent>;
+  let communityDataServiceStub: any;
+  let subCommList = [];
 
   const subcommunities = [Object.assign(new Community(), {
     id: '123456789-1',
@@ -32,34 +40,92 @@ describe('SubCommunityList Component', () => {
           { 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 emptySubCommunitiesCommunity = Object.assign(new Community(), {
+  const mockCommunity = Object.assign(new Community(), {
+    id: '123456789',
     metadata: {
       'dc.title': [
         { language: 'en_US', value: 'Test title' }
       ]
-    },
-    subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), []))
+    }
   });
 
-  const mockCommunity = Object.assign(new Community(), {
-      metadata: {
-        'dc.title': [
-          { language: 'en_US', value: 'Test title' }
-        ]
-      },
-      subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), subcommunities))
-    })
-  ;
+  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$(new PaginatedList(new PageInfo(), subCommList.slice(startPageIndex, endPageIndex)));
+
+    }
+  };
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), SharedModule,
+      imports: [
+        TranslateModule.forRoot(),
+        SharedModule,
         RouterTestingModule.withRoutes([]),
-        NoopAnimationsModule],
+        NgbModule.forRoot(),
+        NoopAnimationsModule
+      ],
       declarations: [CommunityPageSubCommunityListComponent],
+      providers: [
+        { provide: CommunityDataService, useValue: communityDataServiceStub },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: SelectableListService, useValue: {} },
+      ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
@@ -67,23 +133,52 @@ describe('SubCommunityList Component', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(CommunityPageSubCommunityListComponent);
     comp = fixture.componentInstance;
+    comp.community = mockCommunity;
+
   });
 
-  it('should display a list of subCommunities', () => {
-    comp.community = mockCommunity;
+  it('should display a list of sub-communities', () => {
+    subCommList = subcommunities;
     fixture.detectChanges();
 
     const subComList = fixture.debugElement.queryAll(By.css('li'));
-    expect(subComList.length).toEqual(2);
+    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 subCommunities are empty', () => {
-    comp.community = emptySubCommunitiesCommunity;
+  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);
   });
+
+  it('should update list of sub-communities on pagination change', () => {
+    subCommList = subcommunities;
+    fixture.detectChanges();
+
+    const pagination = Object.create({
+      pagination:{
+        id: comp.pageId,
+        currentPage: 2,
+        pageSize: 5
+      },
+      sort: {
+        field: 'dc.title',
+        direction: 'ASC'
+      }
+    });
+    comp.onPaginationChange(pagination);
+    fixture.detectChanges();
+
+    const collList = fixture.debugElement.queryAll(By.css('li'));
+    expect(collList.length).toEqual(2);
+    expect(collList[0].nativeElement.textContent).toContain('SubCommunity 6');
+    expect(collList[1].nativeElement.textContent).toContain('SubCommunity 7');
+  });
 });
diff --git a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts
index 91f6d7bac1..1bd664021e 100644
--- a/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts
+++ b/src/app/+community-page/sub-community-list/community-page-sub-community-list.component.ts
@@ -1,26 +1,82 @@
 import { Component, Input, OnInit } from '@angular/core';
 
+import { BehaviorSubject } from 'rxjs';
+import { take } from 'rxjs/operators';
+
 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';
-import {Observable} from 'rxjs';
+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';
 
 @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
  */
 export class CommunityPageSubCommunityListComponent implements OnInit {
   @Input() community: Community;
-  subCommunitiesRDObs: Observable<RemoteData<PaginatedList<Community>>>;
+
+  /**
+   * The pagination configuration
+   */
+  config: PaginationComponentOptions;
+
+  /**
+   * The pagination id
+   */
+  pageId = 'community-subCommunities-pagination';
+
+  /**
+   * The sorting configuration
+   */
+  sortConfig: SortOptions;
+
+  /**
+   * A list of remote data objects of communities' collections
+   */
+  subCommunitiesRDObs: BehaviorSubject<RemoteData<PaginatedList<Community>>> = new BehaviorSubject<RemoteData<PaginatedList<Community>>>({} as any);
+
+  constructor(private cds: CommunityDataService) {
+  }
 
   ngOnInit(): void {
-    this.subCommunitiesRDObs = this.community.subcommunities;
+    this.config = new PaginationComponentOptions();
+    this.config.id = this.pageId;
+    this.config.pageSize = 5;
+    this.config.currentPage = 1;
+    this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
+    this.updatePage();
+  }
+
+  /**
+   * Called when one of the pagination settings is changed
+   * @param event The new pagination data
+   */
+  onPaginationChange(event) {
+    this.config.currentPage = event.pagination.currentPage;
+    this.config.pageSize = event.pagination.pageSize;
+    this.sortConfig.field = event.sort.field;
+    this.sortConfig.direction = event.sort.direction;
+    this.updatePage();
+  }
+
+  /**
+   * Update the list of sub-communities
+   */
+  updatePage() {
+    this.cds.findByParent(this.community.id, {
+      currentPage: this.config.currentPage,
+      elementsPerPage: this.config.pageSize,
+      sort: { field: this.sortConfig.field, direction: this.sortConfig.direction }
+    }).pipe(take(1)).subscribe((results) => {
+      this.subCommunitiesRDObs.next(results);
+    });
   }
 }
diff --git a/src/app/+home-page/home-page-routing.module.ts b/src/app/+home-page/home-page-routing.module.ts
index d7dcc18f49..78da529906 100644
--- a/src/app/+home-page/home-page-routing.module.ts
+++ b/src/app/+home-page/home-page-routing.module.ts
@@ -2,12 +2,25 @@ import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
 import { HomePageComponent } from './home-page.component';
+import { HomePageResolver } from './home-page.resolver';
 
 @NgModule({
   imports: [
     RouterModule.forChild([
-      { path: '', component: HomePageComponent, pathMatch: 'full', data: { title: 'home.title' } }
+      {
+        path: '',
+        component: HomePageComponent,
+        pathMatch: 'full',
+        data: {title: 'home.title'},
+        resolve: {
+          site: HomePageResolver
+        }
+      }
     ])
+  ],
+  providers: [
+    HomePageResolver
   ]
 })
-export class HomePageRoutingModule { }
+export class HomePageRoutingModule {
+}
diff --git a/src/app/+home-page/home-page.component.html b/src/app/+home-page/home-page.component.html
index 39ba479033..5515df595b 100644
--- a/src/app/+home-page/home-page.component.html
+++ b/src/app/+home-page/home-page.component.html
@@ -1,5 +1,8 @@
 <ds-home-news></ds-home-news>
 <div class="container">
+  <ng-container *ngIf="(site$ | async) as site">
+    <ds-view-tracker [object]="site"></ds-view-tracker>
+  </ng-container>
   <ds-search-form [inPlaceSearch]="false"></ds-search-form>
   <ds-top-level-community-list></ds-top-level-community-list>
 </div>
diff --git a/src/app/+home-page/home-page.component.ts b/src/app/+home-page/home-page.component.ts
index 902a0e820d..65caa01430 100644
--- a/src/app/+home-page/home-page.component.ts
+++ b/src/app/+home-page/home-page.component.ts
@@ -1,9 +1,26 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } from '@angular/core';
+import { map } from 'rxjs/operators';
+import { ActivatedRoute } from '@angular/router';
+import { Observable } from 'rxjs';
+import { Site } from '../core/shared/site.model';
 
 @Component({
   selector: 'ds-home-page',
   styleUrls: ['./home-page.component.scss'],
   templateUrl: './home-page.component.html'
 })
-export class HomePageComponent {
+export class HomePageComponent implements OnInit {
+
+  site$: Observable<Site>;
+
+  constructor(
+    private route: ActivatedRoute,
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.site$ = this.route.data.pipe(
+      map((data) => data.site as Site),
+    );
+  }
 }
diff --git a/src/app/+home-page/home-page.module.ts b/src/app/+home-page/home-page.module.ts
index c0c082b36c..51e978bbfe 100644
--- a/src/app/+home-page/home-page.module.ts
+++ b/src/app/+home-page/home-page.module.ts
@@ -6,12 +6,14 @@ 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';
 
 @NgModule({
   imports: [
     CommonModule,
     SharedModule,
-    HomePageRoutingModule
+    HomePageRoutingModule,
+    StatisticsModule.forRoot()
   ],
   declarations: [
     HomePageComponent,
diff --git a/src/app/+home-page/home-page.resolver.ts b/src/app/+home-page/home-page.resolver.ts
new file mode 100644
index 0000000000..6b63a4e782
--- /dev/null
+++ b/src/app/+home-page/home-page.resolver.ts
@@ -0,0 +1,25 @@
+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 { Observable } from 'rxjs';
+import { take } from 'rxjs/operators';
+
+/**
+ * The class that resolve the Site object for a route
+ */
+@Injectable()
+export class HomePageResolver implements Resolve<Site> {
+  constructor(private siteService: SiteDataService) {
+  }
+
+  /**
+   * Method for resolving a site object
+   * @param {ActivatedRouteSnapshot} route The current ActivatedRouteSnapshot
+   * @param {RouterStateSnapshot} state The current RouterStateSnapshot
+   * @returns Observable<Site> Emits the found Site object, or an error if something went wrong
+   */
+  resolve(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<Site> | Promise<Site> | Site {
+    return this.siteService.find().pipe(take(1));
+  }
+}
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
new file mode 100644
index 0000000000..fa164fe624
--- /dev/null
+++ b/src/app/+home-page/top-level-community-list/top-level-community-list.component.spec.ts
@@ -0,0 +1,161 @@
+import { async, ComponentFixture, TestBed } 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 { TopLevelCommunityListComponent } from './top-level-community-list.component';
+import { Community } from '../../core/shared/community.model';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { SharedModule } from '../../shared/shared.module';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { FindListOptions } from '../../core/data/request.models';
+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';
+
+describe('TopLevelCommunityList Component', () => {
+  let comp: TopLevelCommunityListComponent;
+  let fixture: ComponentFixture<TopLevelCommunityListComponent>;
+  let communityDataServiceStub: any;
+
+  const topCommList = [Object.assign(new Community(), {
+    id: '123456789-1',
+    metadata: {
+      'dc.title': [
+        { 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' }
+        ]
+      }
+    })
+  ];
+
+  communityDataServiceStub = {
+    findTop(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 > topCommList.length) {
+        endPageIndex = topCommList.length;
+      }
+      return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), topCommList.slice(startPageIndex, endPageIndex)));
+
+    }
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot(),
+        SharedModule,
+        RouterTestingModule.withRoutes([]),
+        NgbModule.forRoot(),
+        NoopAnimationsModule
+      ],
+      declarations: [TopLevelCommunityListComponent],
+      providers: [
+        { provide: CommunityDataService, useValue: communityDataServiceStub },
+        { provide: HostWindowService, useValue: new HostWindowServiceStub(0) },
+        { provide: SelectableListService, useValue: {} },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TopLevelCommunityListComponent);
+    comp = fixture.componentInstance;
+    fixture.detectChanges();
+
+  });
+
+  it('should display a list of top-communities', () => {
+    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');
+  });
+
+  it('should update list of top-communities on pagination change', () => {
+    const pagination = Object.create({
+      pagination:{
+        id: comp.pageId,
+        currentPage: 2,
+        pageSize: 5
+      },
+      sort: {
+        field: 'dc.title',
+        direction: 'ASC'
+      }
+    });
+    comp.onPaginationChange(pagination);
+    fixture.detectChanges();
+
+    const collList = fixture.debugElement.queryAll(By.css('li'));
+    expect(collList.length).toEqual(2);
+    expect(collList[0].nativeElement.textContent).toContain('TopCommunity 6');
+    expect(collList[1].nativeElement.textContent).toContain('TopCommunity 7');
+  });
+});
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 1115d785a3..02c3cb54a0 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,15 +1,15 @@
 import { ChangeDetectionStrategy, Component, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable } from 'rxjs';
+
+import { BehaviorSubject } from 'rxjs';
+import { take } from 'rxjs/operators';
+
 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';
-
 import { RemoteData } from '../../core/data/remote-data';
 import { Community } from '../../core/shared/community.model';
-
 import { fadeInOut } from '../../shared/animations/fade';
 import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { take } from 'rxjs/operators';
 
 /**
  * this component renders the Top-Level Community list
@@ -33,6 +33,11 @@ export class TopLevelCommunityListComponent implements OnInit {
    */
   config: PaginationComponentOptions;
 
+  /**
+   * The pagination id
+   */
+  pageId = 'top-level-pagination';
+
   /**
    * The sorting configuration
    */
@@ -40,7 +45,7 @@ export class TopLevelCommunityListComponent implements OnInit {
 
   constructor(private cds: CommunityDataService) {
     this.config = new PaginationComponentOptions();
-    this.config.id = 'top-level-pagination';
+    this.config.id = this.pageId;
     this.config.pageSize = 5;
     this.config.currentPage = 1;
     this.sortConfig = new SortOptions('dc.title', SortDirection.ASC);
@@ -55,10 +60,10 @@ export class TopLevelCommunityListComponent implements OnInit {
    * @param event The new pagination data
    */
   onPaginationChange(event) {
-    this.config.currentPage = event.page;
-    this.config.pageSize = event.pageSize;
-    this.sortConfig.field = event.sortField;
-    this.sortConfig.direction = event.sortDirection;
+    this.config.currentPage = event.pagination.currentPage;
+    this.config.pageSize = event.pagination.pageSize;
+    this.sortConfig.field = event.sort.field;
+    this.sortConfig.direction = event.sort.direction;
     this.updatePage();
   }
 
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 ed9351d5d2..c8740c35b2 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,15 +1,12 @@
-import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
 import { CommonModule } from '@angular/common';
 import { ItemCollectionMapperComponent } from './item-collection-mapper.component';
 import { ActivatedRoute, Router } from '@angular/router';
-import { SearchConfigurationService } from '../../../+search-page/search-service/search-configuration.service';
-import { SearchService } from '../../../+search-page/search-service/search.service';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { RemoteData } from '../../../core/data/remote-data';
-import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { RouterStub } from '../../../shared/testing/router-stub';
@@ -19,7 +16,6 @@ import { SearchServiceStub } from '../../../shared/testing/search-service-stub';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { FormsModule } from '@angular/forms';
-import { SharedModule } from '../../../shared/shared.module';
 import { TranslateModule, TranslateService } from '@ngx-translate/core';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 import { HostWindowService } from '../../../shared/host-window.service';
@@ -28,7 +24,6 @@ import { By } from '@angular/platform-browser';
 import { Item } from '../../../core/shared/item.model';
 import { ObjectSelectService } from '../../../shared/object-select/object-select.service';
 import { ObjectSelectServiceStub } from '../../../shared/testing/object-select-service-stub';
-import { Observable } from 'rxjs/internal/Observable';
 import { of } from 'rxjs/internal/observable/of';
 import { RestResponse } from '../../../core/cache/response.models';
 import { CollectionSelectComponent } from '../../../shared/object-select/collection-select/collection-select.component';
@@ -39,6 +34,9 @@ import { SearchFormComponent } from '../../../shared/search-form/search-form.com
 import { Collection } from '../../../core/shared/collection.model';
 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/paginated-search-options.model';
 
 describe('ItemCollectionMapperComponent', () => {
   let comp: ItemCollectionMapperComponent;
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 97b8164a6e..5494d5ab5f 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
@@ -2,15 +2,12 @@ import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 
 import { ChangeDetectionStrategy, Component, OnInit, ViewChild } from '@angular/core';
 import { fadeIn, fadeInOut } from '../../../shared/animations/fade';
-import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { Collection } from '../../../core/shared/collection.model';
 import { Item } from '../../../core/shared/item.model';
 import { getRemoteDataPayload, getSucceededRemoteData, toDSpaceObjectListRD } from '../../../core/shared/operators';
 import { ActivatedRoute, Router } from '@angular/router';
-import { SearchService } from '../../../+search-page/search-service/search.service';
-import { SearchConfigurationService } from '../../../+search-page/search-service/search-configuration.service';
 import { map, startWith, switchMap, take } from 'rxjs/operators';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { TranslateService } from '@ngx-translate/core';
@@ -19,6 +16,9 @@ import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model'
 import { isNotEmpty } from '../../../shared/empty.util';
 import { RestResponse } from '../../../core/cache/response.models';
 import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 @Component({
   selector: 'ds-item-collection-mapper',
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 e73b4b6f9a..aa84b160a0 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
@@ -9,7 +9,6 @@ import { ActivatedRoute, Router } from '@angular/router';
 import { ItemMoveComponent } from './item-move.component';
 import { NotificationsServiceStub } from '../../../shared/testing/notifications-service-stub';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
-import { SearchService } from '../../../+search-page/search-service/search.service';
 import { of as observableOf } from 'rxjs';
 import { FormsModule } from '@angular/forms';
 import { ItemDataService } from '../../../core/data/item-data.service';
@@ -18,6 +17,7 @@ import { PaginatedList } from '../../../core/data/paginated-list';
 import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
 import { RestResponse } from '../../../core/cache/response.models';
 import { Collection } from '../../../core/shared/collection.model';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 describe('ItemMoveComponent', () => {
   let comp: ItemMoveComponent;
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 113ee97b3f..4db7cf94da 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,12 +1,9 @@
 import { Component, OnInit } from '@angular/core';
-import { SearchService } from '../../../+search-page/search-service/search.service';
 import { first, map } from 'rxjs/operators';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { SearchOptions } from '../../../+search-page/search-options.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { PaginatedList } from '../../../core/data/paginated-list';
-import { SearchResult } from '../../../+search-page/search-result.model';
 import { Item } from '../../../core/shared/item.model';
 import { ActivatedRoute, Router } from '@angular/router';
 import { NotificationsService } from '../../../shared/notifications/notifications.service';
@@ -17,9 +14,10 @@ import { getItemEditPath } from '../../item-page-routing.module';
 import { Observable, of as observableOf } from 'rxjs';
 import { RestResponse } from '../../../core/cache/response.models';
 import { Collection } from '../../../core/shared/collection.model';
-import { tap } from 'rxjs/internal/operators/tap';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
+import { SearchResult } from '../../../shared/search/search-result.model';
 
 @Component({
   selector: 'ds-item-move',
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 302ebf68a7..ee9d2cda27 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
@@ -70,5 +70,4 @@ export class EditRelationshipComponent implements OnChanges {
   canUndo(): boolean {
     return this.fieldUpdate.changeType >= 0;
   }
-
 }
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 1c2080aa6a..0e473149e9 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
@@ -157,7 +157,9 @@ describe('ItemRelationshipsComponent', () => {
         getRelatedItemsByLabel: observableOf([author1, author2]),
         getItemRelationshipsArray: observableOf(relationships),
         deleteRelationship: observableOf(new RestResponse(true, 200, 'OK')),
-        getItemResolvedRelatedItemsAndRelationships: observableCombineLatest(observableOf([author1, author2]), observableOf([item, item]), observableOf(relationships))
+        getItemResolvedRelatedItemsAndRelationships: observableCombineLatest(observableOf([author1, author2]), observableOf([item, item]), observableOf(relationships)),
+        getRelationshipsByRelatedItemIds: observableOf(relationships),
+        getRelationshipTypeLabelsByItem: observableOf([relationshipType.leftwardType])
       }
     );
 
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 e8f34bc70e..42ebc5563e 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
@@ -2,8 +2,8 @@ import { ChangeDetectorRef, Component, Inject, OnDestroy } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
 import { FieldUpdate, FieldUpdates } from '../../../core/data/object-updates/object-updates.reducer';
 import { Observable } from 'rxjs/internal/Observable';
-import { filter, map, switchMap, take, tap } from 'rxjs/operators';
-import { combineLatest as observableCombineLatest, zip as observableZip } from 'rxjs';
+import { filter, flatMap, map, switchMap, take, tap } from 'rxjs/operators';
+import { zip as observableZip } from 'rxjs';
 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';
@@ -21,7 +21,6 @@ import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 import { getSucceededRemoteData } from '../../../core/shared/operators';
 import { RequestService } from '../../../core/data/request.service';
 import { Subscription } from 'rxjs/internal/Subscription';
-import { getRelationsByRelatedItemIds } from '../../simple/item-types/shared/item-relationships-utils';
 
 @Component({
   selector: 'ds-item-relationships',
@@ -65,7 +64,7 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl
    */
   ngOnInit(): void {
     super.ngOnInit();
-    this.relationLabels$ = this.relationshipService.getItemRelationshipLabels(this.item);
+    this.relationLabels$ = this.relationshipService.getRelationshipTypeLabelsByItem(this.item);
     this.initializeItemUpdate();
   }
 
@@ -113,8 +112,9 @@ export class ItemRelationshipsComponent extends AbstractItemUpdateComponent impl
     );
     // Get all the relationships that should be removed
     const removedRelationships$ = removedItemIds$.pipe(
-      getRelationsByRelatedItemIds(this.item, this.relationshipService)
+      flatMap((uuids) => this.relationshipService.getRelationshipsByRelatedItemIds(this.item, uuids))
     );
+    // const removedRelationships$ = removedItemIds$.pipe(flatMap((uuids: string[]) => this.relationshipService.getRelationshipsByRelatedItemIds(this.item, uuids)));
     // Request a delete for every relationship found in the observable created above
     removedRelationships$.pipe(
       take(1),
diff --git a/src/app/+item-page/full/full-item-page.component.html b/src/app/+item-page/full/full-item-page.component.html
index 7aec57da0c..c453df6bff 100644
--- a/src/app/+item-page/full/full-item-page.component.html
+++ b/src/app/+item-page/full/full-item-page.component.html
@@ -1,6 +1,7 @@
 <div class="container" *ngVar="(itemRD$ | async) as itemRD">
   <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="itemRD?.payload as item">
+      <ds-view-tracker [object]="item"></ds-view-tracker>
       <ds-item-page-title-field [item]="item"></ds-item-page-title-field>
       <div class="simple-view-link my-3">
         <a class="btn btn-outline-primary" [routerLink]="['/items/' + item.id]">
diff --git a/src/app/+item-page/item-page.module.ts b/src/app/+item-page/item-page.module.ts
index 2a5d0b6da7..5c54becdde 100644
--- a/src/app/+item-page/item-page.module.ts
+++ b/src/app/+item-page/item-page.module.ts
@@ -26,6 +26,9 @@ import { MetadataRepresentationListComponent } from './simple/metadata-represent
 import { RelatedEntitiesSearchComponent } from './simple/related-entities/related-entities-search/related-entities-search.component';
 import { MetadataValuesComponent } from './field-components/metadata-values/metadata-values.component';
 import { MetadataFieldWrapperComponent } from './field-components/metadata-field-wrapper/metadata-field-wrapper.component';
+import { TabbedRelatedEntitiesSearchComponent } from './simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { AbstractIncrementalListComponent } from './simple/abstract-incremental-list/abstract-incremental-list.component';
 
 @NgModule({
   imports: [
@@ -33,7 +36,8 @@ import { MetadataFieldWrapperComponent } from './field-components/metadata-field
     SharedModule,
     ItemPageRoutingModule,
     EditItemPageModule,
-    SearchPageModule
+    SearchPageModule,
+    StatisticsModule.forRoot()
   ],
   declarations: [
     ItemPageComponent,
@@ -53,7 +57,9 @@ import { MetadataFieldWrapperComponent } from './field-components/metadata-field
     ItemComponent,
     GenericItemPageFieldComponent,
     MetadataRepresentationListComponent,
-    RelatedEntitiesSearchComponent
+    RelatedEntitiesSearchComponent,
+    TabbedRelatedEntitiesSearchComponent,
+    AbstractIncrementalListComponent
   ],
   exports: [
     ItemComponent,
@@ -63,7 +69,8 @@ import { MetadataFieldWrapperComponent } from './field-components/metadata-field
     RelatedEntitiesSearchComponent,
     RelatedItemsComponent,
     MetadataRepresentationListComponent,
-    ItemPageTitleFieldComponent
+    ItemPageTitleFieldComponent,
+    TabbedRelatedEntitiesSearchComponent
   ],
   entryComponents: [
     PublicationComponent
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
new file mode 100644
index 0000000000..e2c0823bf8
--- /dev/null
+++ b/src/app/+item-page/simple/abstract-incremental-list/abstract-incremental-list.component.ts
@@ -0,0 +1,73 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { Subscription } from 'rxjs/internal/Subscription';
+import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+
+@Component({
+  selector: 'ds-abstract-incremental-list',
+  template: ``,
+})
+/**
+ * An abstract component for displaying an incremental list of objects
+ */
+export class AbstractIncrementalListComponent<T> implements OnInit, OnDestroy {
+  /**
+   * The amount to increment the list by
+   * Define this amount in the child component overriding this component
+   */
+  incrementBy: number;
+
+  /**
+   * All pages of objects to display as an array
+   */
+  objects: T[];
+
+  /**
+   * A list of open subscriptions
+   */
+  subscriptions: Subscription[];
+
+  ngOnInit(): void {
+    this.objects = [];
+    this.subscriptions = [];
+    this.increase();
+  }
+
+  /**
+   * Get a specific page
+   * > Override this method to return a specific page
+   * @param page  The page to fetch
+   */
+  getPage(page: number): T {
+    return undefined;
+  }
+
+  /**
+   * Increase the amount displayed
+   */
+  increase() {
+    const page = this.getPage(this.objects.length + 1);
+    if (hasValue(page)) {
+      this.objects.push(page);
+    }
+  }
+
+  /**
+   * Decrease the amount displayed
+   */
+  decrease() {
+    if (this.objects.length > 1) {
+      this.objects.pop();
+    }
+  }
+
+  /**
+   * Unsubscribe from any open subscriptions
+   */
+  ngOnDestroy(): void {
+    if (isNotEmpty(this.subscriptions)) {
+      this.subscriptions.forEach((sub: Subscription) => {
+        sub.unsubscribe();
+      });
+    }
+  }
+}
diff --git a/src/app/+item-page/simple/item-page.component.html b/src/app/+item-page/simple/item-page.component.html
index 501e3e161e..b4b32fb05c 100644
--- a/src/app/+item-page/simple/item-page.component.html
+++ b/src/app/+item-page/simple/item-page.component.html
@@ -1,6 +1,7 @@
 <div class="container" *ngVar="(itemRD$ | async) as itemRD">
   <div class="item-page" *ngIf="itemRD?.hasSucceeded" @fadeInOut>
     <div *ngIf="itemRD?.payload as item">
+      <ds-view-tracker [object]="item"></ds-view-tracker>
       <ds-listable-object-component-loader [object]="item" [viewMode]="viewMode"></ds-listable-object-component-loader>
     </div>
   </div>
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 0ff6612440..9f2eb32d99 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
@@ -4,7 +4,6 @@ import { MockTranslateLoader } from '../../../../shared/mocks/mock-translate-loa
 import { GenericItemPageFieldComponent } from '../../field-components/specific-field/generic/generic-item-page-field.component';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { ItemDataService } from '../../../../core/data/item-data.service';
-import { SearchFixedFilterService } from '../../../../+search-page/search-filters/search-filter/search-fixed-filter.service';
 import { TruncatableService } from '../../../../shared/truncatable/truncatable.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { Item } from '../../../../core/shared/item.model';
@@ -15,6 +14,7 @@ import { createRelationshipsObservable } from '../shared/item.component.spec';
 import { PublicationComponent } from './publication.component';
 import { MetadataMap } from '../../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+import { RelationshipService } from '../../../../core/data/relationship.service';
 
 const mockItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
@@ -26,12 +26,6 @@ describe('PublicationComponent', () => {
   let comp: PublicationComponent;
   let fixture: ComponentFixture<PublicationComponent>;
 
-  const searchFixedFilterServiceStub = {
-    /* tslint:disable:no-empty */
-    getQueryByRelations: () => {}
-    /* tslint:enable:no-empty */
-  };
-
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot({
@@ -43,8 +37,8 @@ describe('PublicationComponent', () => {
       declarations: [PublicationComponent, GenericItemPageFieldComponent, TruncatePipe],
       providers: [
         {provide: ItemDataService, useValue: {}},
-        {provide: SearchFixedFilterService, useValue: searchFixedFilterServiceStub},
-        {provide: TruncatableService, useValue: {}}
+        {provide: TruncatableService, useValue: {}},
+        {provide: RelationshipService, useValue: {}}
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
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 a8c7539e64..d926e1efdb 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,8 +1,8 @@
 import { ChangeDetectionStrategy, Component } from '@angular/core';
-import { ItemComponent } from '../shared/item.component';
-import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 import { Item } from '../../../../core/shared/item.model';
+import { ItemComponent } from '../shared/item.component';
 import { ViewMode } from '../../../../core/shared/view-mode.model';
+import { listableObjectComponent } from '../../../../shared/object-collection/shared/listable-object/listable-object.decorator';
 
 /**
  * Component that represents a publication Item page
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 b40b1a17b6..7baf260c61 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,14 +1,12 @@
-import { getRemoteDataPayload, getSucceededRemoteData } from '../../../../core/shared/operators';
-import { hasNoValue, hasValue } from '../../../../shared/empty.util';
+import { getSucceededRemoteData } from '../../../../core/shared/operators';
+import { hasValue } from '../../../../shared/empty.util';
 import { Observable } from 'rxjs/internal/Observable';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
-import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import { distinctUntilChanged, flatMap, map, switchMap } from 'rxjs/operators';
-import { zip as observableZip, combineLatest as observableCombineLatest } from 'rxjs';
+import { combineLatest as observableCombineLatest, zip as observableZip } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { RelationshipService } from '../../../../core/data/relationship.service';
 import { PaginatedList } from '../../../../core/data/paginated-list';
+import { RemoteData } from '../../../../core/data/remote-data';
 
 /**
  * Operator for comparing arrays using a mapping function
@@ -37,36 +35,6 @@ export const compareArraysUsing = <T>(mapFn: (t: T) => any) =>
 export const compareArraysUsingIds = <T extends { id: string }>() =>
   compareArraysUsing((t: T) => hasValue(t) ? t.id : undefined);
 
-/**
- * Fetch the relationships which match the type label given
- * @param {string} label      Type label
- * @param thisId              The item's id of which the relations belong to
- * @returns {(source: Observable<[Relationship[] , RelationshipType[]]>) => Observable<Relationship[]>}
- */
-export const filterRelationsByTypeLabel = (label: string, thisId?: string) =>
-  (source: Observable<[Relationship[], RelationshipType[]]>): Observable<Relationship[]> =>
-    source.pipe(
-      switchMap(([relsCurrentPage, relTypesCurrentPage]) => {
-        const relatedItems$ = observableZip(...relsCurrentPage.map((rel: Relationship) =>
-            observableCombineLatest(
-              rel.leftItem.pipe(getSucceededRemoteData(), getRemoteDataPayload()),
-              rel.rightItem.pipe(getSucceededRemoteData(), getRemoteDataPayload()))
-          )
-        );
-        return relatedItems$.pipe(
-          map((arr) => relsCurrentPage.filter((rel: Relationship, idx: number) =>
-            hasValue(relTypesCurrentPage[idx]) && (
-              (hasNoValue(thisId) && (relTypesCurrentPage[idx].leftwardType === label ||
-                relTypesCurrentPage[idx].rightwardType === label)) ||
-              (thisId === arr[idx][0].id && relTypesCurrentPage[idx].leftwardType === label) ||
-              (thisId === arr[idx][1].id && relTypesCurrentPage[idx].rightwardType === label)
-            )
-          ))
-        );
-      }),
-      distinctUntilChanged(compareArraysUsingIds())
-    );
-
 /**
  * Operator for turning a list of relationships into a list of the relevant items
  * @param {string} thisId       The item's id of which the relations belong to
@@ -128,17 +96,3 @@ export const paginatedRelationsToItems = (thisId: string) =>
         )
       })
     );
-
-/**
- * Operator for fetching an item's relationships, but filtered by related item IDs (essentially performing a reverse lookup)
- * Only relationships where leftItem or rightItem's ID is present in the list provided will be returned
- * @param item
- * @param relationshipService
- */
-export const getRelationsByRelatedItemIds = (item: Item, relationshipService: RelationshipService) =>
-  (source: Observable<string[]>): Observable<Relationship[]> =>
-    source.pipe(
-      flatMap((relatedItemIds: string[]) => relationshipService.getItemResolvedRelatedItemsAndRelationships(item).pipe(
-        map(([leftItems, rightItems, rels]) => rels.filter((rel: Relationship, index: number) => relatedItemIds.indexOf(leftItems[index].uuid) > -1 || relatedItemIds.indexOf(rightItems[index].uuid) > -1))
-      ))
-    );
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 add2fb1e17..5a9f1c509d 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
@@ -9,7 +9,6 @@ import { MockTranslateLoader } from '../../../../shared/mocks/mock-translate-loa
 import { ChangeDetectionStrategy, DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
 import { TruncatePipe } from '../../../../shared/utils/truncate.pipe';
 import { isNotEmpty } from '../../../../shared/empty.util';
-import { SearchFixedFilterService } from '../../../../+search-page/search-filters/search-filter/search-fixed-filter.service';
 import { RelationshipType } from '../../../../core/shared/item-relationships/relationship-type.model';
 import { PaginatedList } from '../../../../core/data/paginated-list';
 import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
@@ -24,6 +23,7 @@ import { ItemMetadataRepresentation } from '../../../../core/shared/metadata-rep
 import { MetadataMap, MetadataValue } from '../../../../core/shared/metadata.models';
 import { compareArraysUsing, compareArraysUsingIds } from './item-relationships-utils';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+import { RelationshipService } from '../../../../core/data/relationship.service';
 
 /**
  * Create a generic test for an item-page-fields component using a mockItem and the type of component
@@ -37,12 +37,6 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
     let comp: any;
     let fixture: ComponentFixture<any>;
 
-    const searchFixedFilterServiceStub = {
-      /* tslint:disable:no-empty */
-      getQueryByRelations: () => {}
-      /* tslint:enable:no-empty */
-    };
-
     beforeEach(async(() => {
       TestBed.configureTestingModule({
         imports: [TranslateModule.forRoot({
@@ -54,8 +48,8 @@ export function getItemPageFieldsTest(mockItem: Item, component) {
         declarations: [component, GenericItemPageFieldComponent, TruncatePipe],
         providers: [
           {provide: ItemDataService, useValue: {}},
-          {provide: SearchFixedFilterService, useValue: searchFixedFilterServiceStub},
-          {provide: TruncatableService, useValue: {}}
+          {provide: TruncatableService, useValue: {}},
+          {provide: RelationshipService, useValue: {}}
         ],
 
         schemas: [NO_ERRORS_SCHEMA]
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 d4b0c8de89..64a96fdd52 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,4 +1,4 @@
-import { Component, Inject, Input } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { Item } from '../../../../core/shared/item.model';
 
 @Component({
diff --git a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.html b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.html
index 64f1184181..d1281f450a 100644
--- a/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.html
+++ b/src/app/+item-page/simple/metadata-representation-list/metadata-representation-list.component.html
@@ -1,11 +1,20 @@
-<ds-metadata-field-wrapper *ngIf="representations$ && (representations$ | async)?.length > 0" [label]="label">
-  <ds-metadata-representation-loader *ngFor="let rep of (representations$ | async)"
-                         [mdRepresentation]="rep">
-  </ds-metadata-representation-loader>
-  <div *ngIf="(representations$ | async)?.length < total" class="mt-2">
-    <a [routerLink]="" (click)="viewMore()">{{'item.page.related-items.view-more' | translate}}</a>
-  </div>
-  <div *ngIf="limit > originalLimit" class="mt-2">
-    <a [routerLink]="" (click)="viewLess()">{{'item.page.related-items.view-less' | translate}}</a>
-  </div>
+<ds-metadata-field-wrapper [label]="label">
+  <ng-container *ngFor="let objectPage of objects; let i = index">
+    <ng-container *ngVar="(objectPage | async) as representations">
+      <ds-metadata-representation-loader *ngFor="let rep of representations"
+                                         [mdRepresentation]="rep">
+      </ds-metadata-representation-loader>
+      <ds-loading *ngIf="(i + 1) === objects.length && (i > 0) && (!representations || representations?.length === 0)" message="{{'loading.default' | translate}}"></ds-loading>
+      <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && representations?.length > 0">
+        <div *ngIf="(objects.length * incrementBy) < total" class="float-left">
+          <a [routerLink]="" (click)="increase()">{{'item.page.related-items.view-more' |
+            translate:{ amount: (total - (objects.length * incrementBy) < incrementBy) ? total - (objects.length * incrementBy) : incrementBy } }}</a>
+        </div>
+        <div *ngIf="objects.length > 1" class="float-right">
+          <a [routerLink]="" (click)="decrease()">{{'item.page.related-items.view-less' |
+            translate:{ amount: representations?.length } }}</a>
+        </div>
+      </div>
+    </ng-container>
+  </ng-container>
 </ds-metadata-field-wrapper>
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 7beabdceba..ad62ce4418 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
@@ -7,6 +7,8 @@ import { Item } from '../../../core/shared/item.model';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
 import { TranslateModule } from '@ngx-translate/core';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { of as observableOf } from 'rxjs';
 
 const itemType = 'Person';
 const metadataField = 'dc.contributor.author';
@@ -64,7 +66,7 @@ describe('MetadataRepresentationListComponent', () => {
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [MetadataRepresentationListComponent],
+      declarations: [MetadataRepresentationListComponent, VarDirective],
       providers: [
         { provide: RelationshipService, useValue: relationshipService }
       ],
@@ -88,33 +90,29 @@ describe('MetadataRepresentationListComponent', () => {
     expect(fields.length).toBe(2);
   });
 
-  it('should initialize the original limit', () => {
-    expect(comp.originalLimit).toEqual(comp.limit);
+  it('should contain one page of items', () => {
+    expect(comp.objects.length).toEqual(1);
   });
 
-  describe('when viewMore is called', () => {
+  describe('when increase is called', () => {
     beforeEach(() => {
-      comp.viewMore();
+      comp.increase();
     });
 
-    it('should set the limit to a high number in order to retrieve all metadata representations', () => {
-      expect(comp.limit).toBeGreaterThanOrEqual(999);
+    it('should add a new page to the list', () => {
+      expect(comp.objects.length).toEqual(2);
     });
   });
 
-  describe('when viewLess is called', () => {
-    let originalLimit;
-
+  describe('when decrease is called', () => {
     beforeEach(() => {
-      // Store the original value of limit
-      originalLimit = comp.limit;
-      // Set limit to a random number
-      comp.limit = 458;
-      comp.viewLess();
+      // Add a second page
+      comp.objects.push(observableOf(undefined));
+      comp.decrease();
     });
 
-    it('should reset the limit to the original value', () => {
-      expect(comp.limit).toEqual(originalLimit);
+    it('should decrease the list of pages', () => {
+      expect(comp.objects.length).toEqual(1);
     });
   });
 
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 b58290d87c..23484f22e0 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,16 +1,16 @@
-import { Component, Input, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { MetadataRepresentation } from '../../../core/shared/metadata-representation/metadata-representation.model';
-import { Observable } from 'rxjs/internal/Observable';
-import { RemoteData } from '../../../core/data/remote-data';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf, zip as observableZip } from 'rxjs';
 import { RelationshipService } from '../../../core/data/relationship.service';
-import { Item } from '../../../core/shared/item.model';
-import { combineLatest as observableCombineLatest, of as observableOf, zip as observableZip } from 'rxjs';
 import { MetadataValue } from '../../../core/shared/metadata.models';
-import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
-import { filter, map, switchMap } from 'rxjs/operators';
 import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { filter, map, switchMap } from 'rxjs/operators';
+import { RemoteData } from '../../../core/data/remote-data';
 import { Relationship } from '../../../core/shared/item-relationships/relationship.model';
+import { Item } from '../../../core/shared/item.model';
+import { MetadatumRepresentation } from '../../../core/shared/metadata-representation/metadatum/metadatum-representation.model';
 import { ItemMetadataRepresentation } from '../../../core/shared/metadata-representation/item/item-metadata-representation.model';
+import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 
 @Component({
   selector: 'ds-metadata-representation-list',
@@ -22,7 +22,7 @@ import { ItemMetadataRepresentation } from '../../../core/shared/metadata-repres
  * It expects an itemType to resolve the metadata to a an item
  * It expects a label to put on top of the list
  */
-export class MetadataRepresentationListComponent implements OnInit {
+export class MetadataRepresentationListComponent extends AbstractIncrementalListComponent<Observable<MetadataRepresentation[]>> {
   /**
    * The parent of the list of related items to display
    */
@@ -44,22 +44,11 @@ export class MetadataRepresentationListComponent implements OnInit {
   @Input() label: string;
 
   /**
-   * The max amount of representations to display
+   * The amount to increment the list by when clicking "view more"
    * Defaults to 10
    * The default can optionally be overridden by providing the limit as input to the component
    */
-  @Input() limit = 10;
-
-  /**
-   * A list of metadata-representations to display
-   */
-  representations$: Observable<MetadataRepresentation[]>;
-
-  /**
-   * The originally provided limit
-   * Used for resetting the limit to the original value when collapsing the list
-   */
-  originalLimit: number;
+  @Input() incrementBy = 10;
 
   /**
    * The total amount of metadata values available
@@ -67,30 +56,28 @@ export class MetadataRepresentationListComponent implements OnInit {
   total: number;
 
   constructor(public relationshipService: RelationshipService) {
-  }
-
-  ngOnInit(): void {
-    this.originalLimit = this.limit;
-    this.setRepresentations();
+    super();
   }
 
   /**
-   * Initialize the metadata representations
+   * Get a specific page
+   * @param page  The page to fetch
    */
-  setRepresentations() {
+  getPage(page: number): Observable<MetadataRepresentation[]> {
     const metadata = this.parentItem.findMetadataSortedByPlace(this.metadataField);
     this.total = metadata.length;
-    this.representations$ = this.resolveMetadataRepresentations(metadata);
+    return this.resolveMetadataRepresentations(metadata, page);
   }
 
   /**
    * Resolve a list of metadata values to a list of metadata representations
-   * @param metadata
+   * @param metadata  The list of all metadata values
+   * @param page      The page to return representations for
    */
-  resolveMetadataRepresentations(metadata: MetadataValue[]): Observable<MetadataRepresentation[]> {
+  resolveMetadataRepresentations(metadata: MetadataValue[], page: number): Observable<MetadataRepresentation[]> {
     return observableZip(
       ...metadata
-        .slice(0, this.limit)
+        .slice((this.objects.length * this.incrementBy), (this.objects.length * this.incrementBy) + this.incrementBy)
         .map((metadatum: any) => Object.assign(new MetadataValue(), metadatum))
         .map((metadatum: MetadataValue) => {
           if (metadatum.isVirtual) {
@@ -115,20 +102,4 @@ export class MetadataRepresentationListComponent implements OnInit {
         })
     );
   }
-
-  /**
-   * Expand the list to display all metadata representations
-   */
-  viewMore() {
-    this.limit = 9999;
-    this.setRepresentations();
-  }
-
-  /**
-   * Collapse the list to display the originally displayed metadata representations
-   */
-  viewLess() {
-    this.limit = this.originalLimit;
-    this.setRepresentations();
-  }
 }
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 c7e1f77264..75f3b7aaad 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
@@ -1,6 +1,7 @@
-<ds-filtered-search-page
+<ds-configuration-search-page
   [fixedFilterQuery]="fixedFilter"
+  [configuration]="configuration"
   [configuration$]="configuration$"
   [searchEnabled]="searchEnabled"
   [sideBarWidth]="sideBarWidth">
-</ds-filtered-search-page>
+</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 711e1b9d3d..d9e5dd9dce 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
@@ -4,31 +4,23 @@ 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 { SearchFixedFilterService } from '../../../../+search-page/search-filters/search-filter/search-fixed-filter.service';
 import { Item } from '../../../../core/shared/item.model';
 
 describe('RelatedEntitiesSearchComponent', () => {
   let comp: RelatedEntitiesSearchComponent;
   let fixture: ComponentFixture<RelatedEntitiesSearchComponent>;
-  let fixedFilterService: SearchFixedFilterService;
 
   const mockItem = Object.assign(new Item(), {
     id: 'id1'
   });
   const mockRelationType = 'publicationsOfAuthor';
-  const mockRelationEntityType = 'publication';
+  const mockConfiguration = 'publication';
   const mockFilter= `f.${mockRelationType}=${mockItem.id}`;
-  const fixedFilterServiceStub = {
-    getFilterByRelation: () => mockFilter
-  };
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
       declarations: [RelatedEntitiesSearchComponent],
-      providers: [
-        { provide: SearchFixedFilterService, useValue: fixedFilterServiceStub }
-      ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
@@ -36,10 +28,9 @@ describe('RelatedEntitiesSearchComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(RelatedEntitiesSearchComponent);
     comp = fixture.componentInstance;
-    fixedFilterService = (comp as any).fixedFilterService;
     comp.relationType = mockRelationType;
     comp.item = mockItem;
-    comp.relationEntityType = mockRelationEntityType;
+    comp.configuration = mockConfiguration;
     fixture.detectChanges();
   });
 
@@ -49,7 +40,7 @@ describe('RelatedEntitiesSearchComponent', () => {
 
   it('should create a configuration$', () => {
     comp.configuration$.subscribe((configuration) => {
-      expect(configuration).toEqual(mockRelationEntityType);
+      expect(configuration).toEqual(mockConfiguration);
     })
   });
 
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 4c0b127925..595734ed9f 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,9 +1,9 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 import { Item } from '../../../../core/shared/item.model';
-import { SearchFixedFilterService } from '../../../../+search-page/search-filters/search-filter/search-fixed-filter.service';
 import { isNotEmpty } from '../../../../shared/empty.util';
 import { of } from 'rxjs/internal/observable/of';
+import { getFilterByRelation } from '../../../../shared/utils/relation-query.utils';
 
 @Component({
   selector: 'ds-related-entities-search',
@@ -22,18 +22,16 @@ export class RelatedEntitiesSearchComponent implements OnInit {
    */
   @Input() relationType: string;
 
+  /**
+   * An optional configuration to use for the search options
+   */
+  @Input() configuration: string;
+
   /**
    * The item to render relationships for
    */
   @Input() item: Item;
 
-  /**
-   * The entity type of the relationship items to be displayed
-   * e.g. 'publication'
-   * This determines the title of the search results (if search is enabled)
-   */
-  @Input() relationEntityType: string;
-
   /**
    * Whether or not the search bar and title should be displayed (defaults to true)
    * @type {boolean}
@@ -49,15 +47,12 @@ export class RelatedEntitiesSearchComponent implements OnInit {
   fixedFilter: string;
   configuration$: Observable<string>;
 
-  constructor(private fixedFilterService: SearchFixedFilterService) {
-  }
-
   ngOnInit(): void {
     if (isNotEmpty(this.relationType) && isNotEmpty(this.item)) {
-      this.fixedFilter = this.fixedFilterService.getFilterByRelation(this.relationType, this.item.id);
+      this.fixedFilter = getFilterByRelation(this.relationType, this.item.id);
     }
-    if (isNotEmpty(this.relationEntityType)) {
-      this.configuration$ = of(this.relationEntityType);
+    if (isNotEmpty(this.configuration)) {
+      this.configuration$ = of(this.configuration);
     }
   }
 
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
new file mode 100644
index 0000000000..f9642d2c01
--- /dev/null
+++ b/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.html
@@ -0,0 +1,22 @@
+<ngb-tabset *ngIf="relationTypes.length > 1" [destroyOnHide]="true" #tabs="ngbTabset" [activeId]="activeTab$ | async" (tabChange)="onTabChange($event)">
+  <ngb-tab *ngFor="let relationType of relationTypes" title="{{'item.page.relationships.' + relationType.label | translate}}" [id]="relationType.filter">
+    <ng-template ngbTabContent>
+      <div class="mt-4">
+        <ds-related-entities-search [item]="item"
+                                    [relationType]="relationType.filter"
+                                    [configuration]="relationType.configuration"
+                                    [searchEnabled]="searchEnabled"
+                                    [sideBarWidth]="sideBarWidth">
+        </ds-related-entities-search>
+      </div>
+    </ng-template>
+  </ngb-tab>
+</ngb-tabset>
+<div *ngIf="relationTypes.length === 1" class="mt-4">
+  <ds-related-entities-search *ngVar="relationTypes[0] as relationType" [item]="item"
+                              [relationType]="relationType.filter"
+                              [configuration]="relationType.configuration"
+                              [searchEnabled]="searchEnabled"
+                              [sideBarWidth]="sideBarWidth">
+  </ds-related-entities-search>
+</div>
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
new file mode 100644
index 0000000000..2d2e682196
--- /dev/null
+++ b/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.spec.ts
@@ -0,0 +1,82 @@
+import { async, ComponentFixture, TestBed } 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 { MockRouter } from '../../../../shared/mocks/mock-router';
+import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
+import { VarDirective } from '../../../../shared/utils/var.directive';
+import { of as observableOf } from 'rxjs';
+
+describe('TabbedRelatedEntitiesSearchComponent', () => {
+  let comp: TabbedRelatedEntitiesSearchComponent;
+  let fixture: ComponentFixture<TabbedRelatedEntitiesSearchComponent>;
+
+  const mockItem = Object.assign(new Item(), {
+    id: 'id1'
+  });
+  const mockRelationType = 'publications';
+  const relationTypes = [
+    {
+      label: mockRelationType,
+      filter: mockRelationType
+    }
+  ];
+
+  const router = new MockRouter();
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), NoopAnimationsModule, NgbModule.forRoot()],
+      declarations: [TabbedRelatedEntitiesSearchComponent, VarDirective],
+      providers: [
+        {
+          provide: ActivatedRoute,
+          useValue: {
+            queryParams: observableOf({ tab: mockRelationType })
+          },
+        },
+        { provide: Router, useValue: router }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(TabbedRelatedEntitiesSearchComponent);
+    comp = fixture.componentInstance;
+    comp.item = mockItem;
+    comp.relationTypes = relationTypes;
+    fixture.detectChanges();
+  });
+
+  it('should initialize the activeTab depending on the current query parameters', () => {
+    comp.activeTab$.subscribe((activeTab) => {
+      expect(activeTab).toEqual(mockRelationType);
+    });
+  });
+
+  describe('onTabChange', () => {
+    const event = {
+      currentId: mockRelationType,
+      nextId: 'nextTab'
+    };
+
+    beforeEach(() => {
+      comp.onTabChange(event);
+    });
+
+    it('should call router natigate with the correct arguments', () => {
+      expect(router.navigate).toHaveBeenCalledWith([], {
+        relativeTo: (comp as any).route,
+        queryParams: {
+          tab: event.nextId
+        },
+        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
new file mode 100644
index 0000000000..b01eb70720
--- /dev/null
+++ b/src/app/+item-page/simple/related-entities/tabbed-related-entities-search/tabbed-related-entities-search.component.ts
@@ -0,0 +1,76 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { Item } from '../../../../core/shared/item.model';
+import { ActivatedRoute, Router } from '@angular/router';
+import { Observable } from 'rxjs/internal/Observable';
+import { map } from 'rxjs/operators';
+
+@Component({
+  selector: 'ds-tabbed-related-entities-search',
+  templateUrl: './tabbed-related-entities-search.component.html'
+})
+/**
+ * A component to show related items as search results, split into tabs by relationship-type
+ * Related items can be facetted, or queried using an
+ * optional search box.
+ */
+export class TabbedRelatedEntitiesSearchComponent implements OnInit {
+  /**
+   * The types of relationships to fetch items for
+   * e.g. 'isAuthorOfPublication'
+   */
+  @Input() relationTypes: Array<{
+    label: string,
+    filter: string,
+    configuration?: string
+  }>;
+
+  /**
+   * The item to render relationships for
+   */
+  @Input() item: Item;
+
+  /**
+   * Whether or not the search bar and title should be displayed (defaults to true)
+   * @type {boolean}
+   */
+  @Input() searchEnabled = true;
+
+  /**
+   * The ratio of the sidebar's width compared to the search results (1-12) (defaults to 4)
+   * @type {number}
+   */
+  @Input() sideBarWidth = 4;
+
+  /**
+   * The active tab
+   */
+  activeTab$: Observable<string>;
+
+  constructor(private route: ActivatedRoute,
+              private router: Router) {
+  }
+
+  /**
+   * If the url contains a "tab" query parameter, set this tab to be the active tab
+   */
+  ngOnInit(): void {
+    this.activeTab$ = this.route.queryParams.pipe(
+      map((params) => params.tab)
+    );
+  }
+
+  /**
+   * Add a "tab" query parameter to the URL when changing tabs
+   * @param event
+   */
+  onTabChange(event) {
+    this.router.navigate([], {
+      relativeTo: this.route,
+      queryParams: {
+        tab: event.nextId
+      },
+      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 9cbfd2c28d..0446e53be5 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,12 +1,12 @@
-import { Component, HostBinding, Input, OnDestroy, OnInit } from '@angular/core';
+import { Component, Input } from '@angular/core';
 import { Item } from '../../../core/shared/item.model';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
-import { RelationshipService } from '../../../core/data/relationship.service';
-import { FindAllOptions } from '../../../core/data/request.models';
-import { Subscription } from 'rxjs/internal/Subscription';
+import { FindListOptions } from '../../../core/data/request.models';
 import { ViewMode } from '../../../core/shared/view-mode.model';
+import { RelationshipService } from '../../../core/data/relationship.service';
+import { AbstractIncrementalListComponent } from '../abstract-incremental-list/abstract-incremental-list.component';
 
 @Component({
   selector: 'ds-related-items',
@@ -17,7 +17,7 @@ import { ViewMode } from '../../../core/shared/view-mode.model';
  * This component is used for displaying relations between items
  * It expects a parent item and relationship type, as well as a label to display on top
  */
-export class RelatedItemsComponent implements OnInit, OnDestroy {
+export class RelatedItemsComponent extends AbstractIncrementalListComponent<Observable<RemoteData<PaginatedList<Item>>>> {
   /**
    * The parent of the list of related items to display
    */
@@ -30,79 +30,38 @@ export class RelatedItemsComponent implements OnInit, OnDestroy {
   @Input() relationType: string;
 
   /**
-   * Default options to start a search request with
-   * Optional input, should you wish a different page size (or other options)
+   * The amount to increment the list by when clicking "view more"
+   * Defaults to 5
+   * The default can optionally be overridden by providing the limit as input to the component
    */
-  @Input() options = Object.assign(new FindAllOptions(), { elementsPerPage: 5 });
+  @Input() incrementBy = 5;
+
+  /**
+   * Default options to start a search request with
+   * Optional input
+   */
+  @Input() options = new FindListOptions();
 
   /**
    * An i18n label to use as a title for the list (usually describes the relation)
    */
   @Input() label: string;
 
-  /**
-   * Completely hide the component until there's at least one item visible
-   */
-  @HostBinding('class.d-none') hidden = true;
-
-  /**
-   * The list of related items
-   */
-  items$: Observable<RemoteData<PaginatedList<Item>>>;
-
-  /**
-   * Search options for displaying all elements in a list
-   */
-  allOptions = Object.assign(new FindAllOptions(), { elementsPerPage: 9999 });
-
   /**
    * The view-mode we're currently on
-   * @type {ElementViewMode}
+   * @type {ViewMode}
    */
   viewMode = ViewMode.ListElement;
 
-  /**
-   * Whether or not the list is currently expanded to show all related items
-   */
-  showingAll = false;
-
-  /**
-   * Subscription on items used to update the "hidden" property of this component
-   */
-  itemSub: Subscription;
-
   constructor(public relationshipService: RelationshipService) {
-  }
-
-  ngOnInit(): void {
-    this.items$ = this.relationshipService.getRelatedItemsByLabel(this.parentItem, this.relationType, this.options);
-    this.itemSub = this.items$.subscribe((itemsRD: RemoteData<PaginatedList<Item>>) => {
-      this.hidden = !(itemsRD.hasSucceeded && itemsRD.payload && itemsRD.payload.page.length > 0);
-    });
+    super();
   }
 
   /**
-   * Expand the list to display all related items
+   * Get a specific page
+   * @param page  The page to fetch
    */
-  viewMore() {
-    this.items$ = this.relationshipService.getRelatedItemsByLabel(this.parentItem, this.relationType, this.allOptions);
-    this.showingAll = true;
-  }
-
-  /**
-   * Collapse the list to display the originally displayed items
-   */
-  viewLess() {
-    this.items$ = this.relationshipService.getRelatedItemsByLabel(this.parentItem, this.relationType, this.options);
-    this.showingAll = false;
-  }
-
-  /**
-   * Unsubscribe from the item subscription
-   */
-  ngOnDestroy(): void {
-    if (this.itemSub) {
-      this.itemSub.unsubscribe();
-    }
+  getPage(page: number): Observable<RemoteData<PaginatedList<Item>>> {
+    return this.relationshipService.getRelatedItemsByLabel(this.parentItem, this.relationType, Object.assign(this.options, { elementsPerPage: this.incrementBy, currentPage: page }));
   }
 }
diff --git a/src/app/+item-page/simple/related-items/related-items.component.html b/src/app/+item-page/simple/related-items/related-items.component.html
index bb6c2afdc6..11cedc4040 100644
--- a/src/app/+item-page/simple/related-items/related-items.component.html
+++ b/src/app/+item-page/simple/related-items/related-items.component.html
@@ -1,11 +1,20 @@
-<ds-metadata-field-wrapper *ngIf="(items$ | async)?.payload?.page?.length > 0" [label]="label">
-  <ds-listable-object-component-loader *ngFor="let item of (items$ | async)?.payload?.page"
-                           [object]="item" [viewMode]="viewMode">
-  </ds-listable-object-component-loader>
-  <div *ngIf="(items$ | async)?.payload?.page?.length < (items$ | async)?.payload?.totalElements" class="mt-2" id="view-more">
-    <a [routerLink]="" (click)="viewMore()">{{'item.page.related-items.view-more' | translate}}</a>
-  </div>
-  <div *ngIf="showingAll" class="mt-2" id="view-less">
-    <a [routerLink]="" (click)="viewLess()">{{'item.page.related-items.view-less' | translate}}</a>
-  </div>
+<ds-metadata-field-wrapper [label]="label">
+  <ng-container *ngFor="let objectPage of objects; let i = index">
+    <ng-container *ngVar="(objectPage | async) as itemsRD">
+      <ds-listable-object-component-loader *ngFor="let item of itemsRD?.payload?.page"
+                                           [object]="item" [viewMode]="viewMode">
+      </ds-listable-object-component-loader>
+      <ds-loading *ngIf="(i + 1) === objects.length && (itemsRD || i > 0) && !(itemsRD?.hasSucceeded && itemsRD?.payload && itemsRD?.payload?.page?.length > 0)" message="{{'loading.default' | translate}}"></ds-loading>
+      <div class="d-inline-block w-100 mt-2" *ngIf="(i + 1) === objects.length && itemsRD?.payload?.page?.length > 0">
+        <div *ngIf="itemsRD?.payload?.totalPages > objects.length" class="float-left" id="view-more">
+          <a [routerLink]="" (click)="increase()">{{'item.page.related-items.view-more' |
+            translate:{ amount: (itemsRD?.payload?.totalElements - (incrementBy * objects.length) < incrementBy) ? itemsRD?.payload?.totalElements - (incrementBy * objects.length) : incrementBy } }}</a>
+        </div>
+        <div *ngIf="objects.length > 1" class="float-right" id="view-less">
+          <a [routerLink]="" (click)="decrease()">{{'item.page.related-items.view-less' |
+            translate:{ amount: itemsRD?.payload?.page?.length } }}</a>
+        </div>
+      </div>
+    </ng-container>
+  </ng-container>
 </ds-metadata-field-wrapper>
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 4a751a31b8..5b1f33c64d 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
@@ -9,6 +9,8 @@ import { createRelationshipsObservable } from '../item-types/shared/item.compone
 import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
 import { RelationshipService } from '../../../core/data/relationship.service';
 import { TranslateModule } from '@ngx-translate/core';
+import { VarDirective } from '../../../shared/utils/var.directive';
+import { of as observableOf } from 'rxjs';
 
 const parentItem: Item = Object.assign(new Item(), {
   bundles: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
@@ -42,7 +44,7 @@ describe('RelatedItemsComponent', () => {
 
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
-      declarations: [RelatedItemsComponent],
+      declarations: [RelatedItemsComponent, VarDirective],
       providers: [
         { provide: RelationshipService, useValue: relationshipService }
       ],
@@ -65,31 +67,33 @@ describe('RelatedItemsComponent', () => {
     expect(fields.length).toBe(mockItems.length);
   });
 
-  describe('when viewMore is called', () => {
+  it('should contain one page of items', () => {
+    expect(comp.objects.length).toEqual(1);
+  });
+
+  describe('when increase is called', () => {
     beforeEach(() => {
-      comp.viewMore();
+      comp.increase();
     });
 
-    it('should call relationship-service\'s getRelatedItemsByLabel with the correct arguments', () => {
-      expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, comp.allOptions);
+    it('should add a new page to the list', () => {
+      expect(comp.objects.length).toEqual(2);
     });
 
-    it('should set showingAll to true', () => {
-      expect(comp.showingAll).toEqual(true);
+    it('should call relationship-service\'s getRelatedItemsByLabel with the correct arguments (second page)', () => {
+      expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, Object.assign(comp.options, { elementsPerPage: comp.incrementBy, currentPage: 2 }));
     });
   });
 
-  describe('when viewLess is called', () => {
+  describe('when decrease is called', () => {
     beforeEach(() => {
-      comp.viewLess();
+      // Add a second page
+      comp.objects.push(observableOf(undefined));
+      comp.decrease();
     });
 
-    it('should call relationship-service\'s getRelatedItemsByLabel with the correct arguments', () => {
-      expect(relationshipService.getRelatedItemsByLabel).toHaveBeenCalledWith(parentItem, relationType, comp.options);
-    });
-
-    it('should set showingAll to false', () => {
-      expect(comp.showingAll).toEqual(false);
+    it('should decrease the list of pages', () => {
+      expect(comp.objects.length).toEqual(1);
     });
   });
 
diff --git a/src/app/+lookup-by-id/lookup-guard.ts b/src/app/+lookup-by-id/lookup-guard.ts
index c89e329241..a7ddffcd4e 100644
--- a/src/app/+lookup-by-id/lookup-guard.ts
+++ b/src/app/+lookup-by-id/lookup-guard.ts
@@ -18,7 +18,7 @@ export class LookupGuard implements CanActivate {
   constructor(private dsoService: DsoRedirectDataService) {
   }
 
-  canActivate(route: ActivatedRouteSnapshot, state:RouterStateSnapshot): Observable<boolean>  {
+  canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<boolean>  {
     const params = this.getLookupParams(route);
     return this.dsoService.findById(params.id, params.type).pipe(
       map((response: RemoteData<FindByIDRequest>) => response.hasFailed)
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 38d6769437..7037a971f0 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,10 +1,10 @@
 import { of as observableOf } from 'rxjs';
 
 import { MyDSpaceConfigurationService } from './my-dspace-configuration.service';
-import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
 import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { SearchFilter } from '../+search-page/search-filter.model';
+import { SearchFilter } from '../shared/search/search-filter.model';
 import { ActivatedRouteStub } from '../shared/testing/active-router-stub';
 import { MockRoleService } from '../shared/mocks/mock-role-service';
 import { cold, hot } from 'jasmine-marbles';
@@ -38,12 +38,8 @@ describe('MyDSpaceConfigurationService', () => {
 
   const roleService: any = new MockRoleService();
 
-  const fixedFilterService = jasmine.createSpyObj('SearchFixedFilterService', {
-    getQueryByFilterName: observableOf(''),
-  });
-
   beforeEach(() => {
-    service = new MyDSpaceConfigurationService(roleService, fixedFilterService, spy, activatedRoute);
+    service = new MyDSpaceConfigurationService(roleService, spy, activatedRoute);
   });
 
   describe('when the scope is called', () => {
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 39c7574407..10ca580d3c 100644
--- a/src/app/+my-dspace-page/my-dspace-configuration.service.ts
+++ b/src/app/+my-dspace-page/my-dspace-configuration.service.ts
@@ -6,12 +6,11 @@ import { first, map } from 'rxjs/operators';
 
 import { MyDSpaceConfigurationValueType } from './my-dspace-configuration-value-type';
 import { RoleService } from '../core/roles/role.service';
-import { SearchConfigurationOption } from '../+search-page/search-switch-configuration/search-configuration-option.model';
-import { SearchConfigurationService } from '../+search-page/search-service/search-configuration.service';
-import { RouteService } from '../core/services/route.service';
+import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
+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 { SearchFixedFilterService } from '../+search-page/search-filters/search-filter/search-fixed-filter.service';
+import { RouteService } from '../core/services/route.service';
 
 /**
  * Service that performs all actions that have to do with the current mydspace configuration
@@ -55,16 +54,14 @@ export class MyDSpaceConfigurationService extends SearchConfigurationService {
    * Initialize class
    *
    * @param {roleService} roleService
-   * @param {SearchFixedFilterService} fixedFilterService
    * @param {RouteService} routeService
    * @param {ActivatedRoute} route
    */
   constructor(protected roleService: RoleService,
-              protected fixedFilterService: SearchFixedFilterService,
               protected routeService: RouteService,
               protected route: ActivatedRoute) {
 
-    super(routeService, fixedFilterService, route);
+    super(routeService, route);
 
     // override parent class initialization
     this._defaults = null;
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 76853db924..81d66bb5f7 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
@@ -14,7 +14,7 @@ import { UploaderOptions } from '../../shared/uploader/uploader-options.model';
 import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
 import { NotificationType } from '../../shared/notifications/models/notification-type';
 import { hasValue } from '../../shared/empty.util';
-import { SearchResult } from '../../+search-page/search-result.model';
+import { SearchResult } from '../../shared/search/search-result.model';
 
 /**
  * This component represents the whole mydspace page header
@@ -33,12 +33,7 @@ export class MyDSpaceNewSubmissionComponent implements OnDestroy, OnInit {
   /**
    * The UploaderOptions object
    */
-  public uploadFilesOptions: UploaderOptions = {
-    url: '',
-    authToken: null,
-    disableMultipart: false,
-    itemAlias: null
-  };
+  public uploadFilesOptions: UploaderOptions = new UploaderOptions();
 
   /**
    * Subscription to unsubscribe from
diff --git a/src/app/+my-dspace-page/my-dspace-page.component.scss b/src/app/+my-dspace-page/my-dspace-page.component.scss
index 86c589bf66..98c426c269 100644
--- a/src/app/+my-dspace-page/my-dspace-page.component.scss
+++ b/src/app/+my-dspace-page/my-dspace-page.component.scss
@@ -1 +1 @@
-@import '../+search-page/search-page.component.scss';
+@import '../+search-page/search.component.scss';
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 b9f7fc881a..9970b4b8b2 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
@@ -19,15 +19,14 @@ import { MyDSpacePageComponent, SEARCH_CONFIG_SERVICE } from './my-dspace-page.c
 import { RouteService } from '../core/services/route.service';
 import { routeServiceStub } from '../shared/testing/route-service-stub';
 import { SearchConfigurationServiceStub } from '../shared/testing/search-configuration-service-stub';
-import { SearchService } from '../+search-page/search-service/search.service';
-import { SearchConfigurationService } from '../+search-page/search-service/search-configuration.service';
-import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
+import { SearchService } from '../core/shared/search/search.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { SearchFilterService } from '../+search-page/search-filters/search-filter/search-filter.service';
+import { SearchFilterService } from '../core/shared/search/search-filter.service';
 import { RoleDirective } from '../shared/roles/role.directive';
 import { RoleService } from '../core/roles/role.service';
 import { MockRoleService } from '../shared/mocks/mock-role-service';
-import { SearchFixedFilterService } from '../+search-page/search-filters/search-filter/search-fixed-filter.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/testing/utils';
 
 describe('MyDSpacePageComponent', () => {
@@ -82,8 +81,6 @@ describe('MyDSpacePageComponent', () => {
     collapse: () => this.isCollapsed = observableOf(true),
     expand: () => this.isCollapsed = observableOf(false)
   };
-  const mockFixedFilterService: SearchFixedFilterService = {
-  } as SearchFixedFilterService;
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
@@ -123,10 +120,6 @@ describe('MyDSpacePageComponent', () => {
           provide: RoleService,
           useValue: new MockRoleService()
         },
-        {
-          provide: SearchFixedFilterService,
-          useValue: mockFixedFilterService
-        }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(MyDSpacePageComponent, {
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 057155418c..6556eaaf1f 100644
--- a/src/app/+my-dspace-page/my-dspace-page.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-page.component.ts
@@ -15,19 +15,19 @@ import { RemoteData } from '../core/data/remote-data';
 import { DSpaceObject } from '../core/shared/dspace-object.model';
 import { pushInOut } from '../shared/animations/push';
 import { HostWindowService } from '../shared/host-window.service';
-import { PaginatedSearchOptions } from '../+search-page/paginated-search-options.model';
-import { SearchService } from '../+search-page/search-service/search.service';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
+import { SearchService } from '../core/shared/search/search.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
 import { hasValue } from '../shared/empty.util';
 import { getSucceededRemoteData } from '../core/shared/operators';
 import { MyDSpaceResponseParsingService } from '../core/data/mydspace-response-parsing.service';
-import { SearchConfigurationOption } from '../+search-page/search-switch-configuration/search-configuration-option.model';
+import { SearchConfigurationOption } from '../shared/search/search-switch-configuration/search-configuration-option.model';
 import { RoleType } from '../core/roles/role-types';
-import { SearchConfigurationService } from '../+search-page/search-service/search-configuration.service';
+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 { SearchResult } from '../+search-page/search-result.model';
+import { SearchResult } from '../shared/search/search-result.model';
 import { Context } from '../core/shared/context.model';
 
 export const MYDSPACE_ROUTE = '/mydspace';
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 be14aebdea..1cf30c4ec9 100644
--- a/src/app/+my-dspace-page/my-dspace-page.module.ts
+++ b/src/app/+my-dspace-page/my-dspace-page.module.ts
@@ -5,7 +5,6 @@ import { SharedModule } from '../shared/shared.module';
 
 import { MyDspacePageRoutingModule } from './my-dspace-page-routing.module';
 import { MyDSpacePageComponent } from './my-dspace-page.component';
-import { SearchPageModule } from '../+search-page/search-page.module';
 import { MyDSpaceResultsComponent } from './my-dspace-results/my-dspace-results.component';
 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';
@@ -27,7 +26,6 @@ import { PoolSearchResultDetailElementComponent } from '../shared/object-detail/
     CommonModule,
     SharedModule,
     MyDspacePageRoutingModule,
-    SearchPageModule
   ],
   declarations: [
     MyDSpacePageComponent,
diff --git a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts b/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
index 91c206fc79..2b0ef84658 100644
--- a/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
+++ b/src/app/+my-dspace-page/my-dspace-results/my-dspace-results.component.ts
@@ -2,12 +2,12 @@ import { Component, Input } from '@angular/core';
 import { RemoteData } from '../../core/data/remote-data';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
 import { fadeIn, fadeInOut } from '../../shared/animations/fade';
-import { SearchOptions } from '../../+search-page/search-options.model';
+import { SearchOptions } from '../../shared/search/search-options.model';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { isEmpty } from '../../shared/empty.util';
-import { SearchResult } from '../../+search-page/search-result.model';
 import { Context } from '../../core/shared/context.model';
+import { SearchResult } from '../../shared/search/search-result.model';
 
 /**
  * Component that represents all results for mydspace page
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 a18dd38f78..1d02f578d1 100644
--- a/src/app/+search-page/configuration-search-page.component.spec.ts
+++ b/src/app/+search-page/configuration-search-page.component.spec.ts
@@ -1,7 +1,7 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { configureSearchComponentTestingModule } from './search-page.component.spec';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
+import { configureSearchComponentTestingModule } from './search.component.spec';
 import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 
 describe('ConfigurationSearchPageComponent', () => {
   let comp: ConfigurationSearchPageComponent;
diff --git a/src/app/+search-page/configuration-search-page.component.ts b/src/app/+search-page/configuration-search-page.component.ts
index dbe54de72f..befac7f331 100644
--- a/src/app/+search-page/configuration-search-page.component.ts
+++ b/src/app/+search-page/configuration-search-page.component.ts
@@ -1,23 +1,22 @@
 import { HostWindowService } from '../shared/host-window.service';
-import { SearchService } from './search-service/search.service';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { SearchPageComponent } from './search-page.component';
+import { SearchComponent } from './search.component';
 import { ChangeDetectionStrategy, Component, Inject, Input, OnInit } from '@angular/core';
 import { pushInOut } from '../shared/animations/push';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
-import { Observable } from 'rxjs';
-import { PaginatedSearchOptions } from './paginated-search-options.model';
 import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
-import { map } from 'rxjs/operators';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { hasValue } from '../shared/empty.util';
 import { RouteService } from '../core/services/route.service';
+import { SearchService } from '../core/shared/search/search.service';
+import { Router } from '@angular/router';
 
 /**
  * This component renders a search page using a configuration as input.
  */
 @Component({
   selector: 'ds-configuration-search-page',
-  styleUrls: ['./search-page.component.scss'],
-  templateUrl: './search-page.component.html',
+  styleUrls: ['./search.component.scss'],
+  templateUrl: './search.component.html',
   changeDetection: ChangeDetectionStrategy.OnPush,
   animations: [pushInOut],
   providers: [
@@ -28,19 +27,26 @@ import { RouteService } from '../core/services/route.service';
   ]
 })
 
-export class ConfigurationSearchPageComponent extends SearchPageComponent implements OnInit {
+export class ConfigurationSearchPageComponent extends SearchComponent implements OnInit {
   /**
    * The configuration to use for the search options
    * If empty, the configuration will be determined by the route parameter called 'configuration'
    */
   @Input() configuration: string;
 
+  /**
+   * The actual query for the fixed filter.
+   * If empty, the query will be determined by the route parameter called 'filter'
+   */
+  @Input() fixedFilterQuery: string;
+
   constructor(protected service: SearchService,
               protected sidebarService: SidebarService,
               protected windowService: HostWindowService,
               @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-              protected routeService: RouteService) {
-    super(service, sidebarService, windowService, searchConfigService, routeService);
+              protected routeService: RouteService,
+              protected router: Router) {
+    super(service, sidebarService, windowService, searchConfigService, routeService, router);
   }
 
   /**
@@ -52,20 +58,11 @@ export class ConfigurationSearchPageComponent extends SearchPageComponent implem
    */
   ngOnInit(): void {
     super.ngOnInit();
-  }
-
-  /**
-   * Get the current paginated search options after updating the configuration using the configuration input
-   * This is to make sure the configuration is included in the paginated search options, as it is not part of any
-   * query or route parameters
-   * @returns {Observable<PaginatedSearchOptions>}
-   */
-  protected getSearchOptions(): Observable<PaginatedSearchOptions> {
-    return this.searchConfigService.paginatedSearchOptions.pipe(
-      map((options: PaginatedSearchOptions) => {
-        const config = this.configuration || options.configuration;
-        return Object.assign(options, { configuration: config });
-      })
-    );
+    if (hasValue(this.configuration)) {
+      this.routeService.setParameter('configuration', this.configuration);
+    }
+    if (hasValue(this.fixedFilterQuery)) {
+      this.routeService.setParameter('fixedFilterQuery', this.fixedFilterQuery);
+    }
   }
 }
diff --git a/src/app/+search-page/filtered-search-page.component.spec.ts b/src/app/+search-page/filtered-search-page.component.spec.ts
deleted file mode 100644
index 59ab9d7b0d..0000000000
--- a/src/app/+search-page/filtered-search-page.component.spec.ts
+++ /dev/null
@@ -1,21 +0,0 @@
-import { FilteredSearchPageComponent } from './filtered-search-page.component';
-import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { configureSearchComponentTestingModule } from './search-page.component.spec';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
-
-describe('FilteredSearchPageComponent', () => {
-  let comp: FilteredSearchPageComponent;
-  let fixture: ComponentFixture<FilteredSearchPageComponent>;
-  let searchConfigService: SearchConfigurationService;
-
-  beforeEach(async(() => {
-    configureSearchComponentTestingModule(FilteredSearchPageComponent);
-  }));
-
-  beforeEach(() => {
-    fixture = TestBed.createComponent(FilteredSearchPageComponent);
-    comp = fixture.componentInstance;
-    searchConfigService = (comp as any).searchConfigService;
-    fixture.detectChanges();
-  });
-});
diff --git a/src/app/+search-page/filtered-search-page.component.ts b/src/app/+search-page/filtered-search-page.component.ts
deleted file mode 100644
index 5da23bd853..0000000000
--- a/src/app/+search-page/filtered-search-page.component.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-import { HostWindowService } from '../shared/host-window.service';
-import { SearchService } from './search-service/search.service';
-import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { SearchPageComponent } from './search-page.component';
-import { ChangeDetectionStrategy, Component, Inject, Input, OnInit } from '@angular/core';
-import { pushInOut } from '../shared/animations/push';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
-import { Observable } from 'rxjs';
-import { PaginatedSearchOptions } from './paginated-search-options.model';
-import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
-import { map } from 'rxjs/operators';
-import { RouteService } from '../core/services/route.service';
-
-/**
- * This component renders a simple item page.
- * The route parameter 'id' is used to request the item it represents.
- * All fields of the item that should be displayed, are defined in its template.
- */
-@Component({
-  selector: 'ds-filtered-search-page',
-  styleUrls: ['./search-page.component.scss'],
-  templateUrl: './search-page.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [pushInOut],
-  providers: [
-    {
-      provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
-})
-
-export class FilteredSearchPageComponent extends SearchPageComponent implements OnInit {
-  /**
-   * The actual query for the fixed filter.
-   * If empty, the query will be determined by the route parameter called 'filter'
-   */
-  @Input() fixedFilterQuery: string;
-
-  constructor(protected service: SearchService,
-              protected sidebarService: SidebarService,
-              protected windowService: HostWindowService,
-              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-              protected routeService: RouteService) {
-    super(service, sidebarService, windowService, searchConfigService, routeService);
-  }
-
-  /**
-   * Listening to changes in the paginated search options
-   * If something changes, update the search results
-   *
-   * Listen to changes in the scope
-   * If something changes, update the list of scopes for the dropdown
-   */
-  ngOnInit(): void {
-    super.ngOnInit();
-  }
-
-  /**
-   * Get the current paginated search options after updating the fixed filter using the fixedFilterQuery input
-   * This is to make sure the fixed filter is included in the paginated search options, as it is not part of any
-   * query or route parameters
-   * @returns {Observable<PaginatedSearchOptions>}
-   */
-  protected getSearchOptions(): Observable<PaginatedSearchOptions> {
-    return this.searchConfigService.paginatedSearchOptions.pipe(
-      map((options: PaginatedSearchOptions) => {
-        const filter = this.fixedFilterQuery || options.fixedFilter;
-        return Object.assign(options, { fixedFilter: filter });
-      })
-    );
-  }
-}
diff --git a/src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.spec.ts b/src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.spec.ts
deleted file mode 100644
index 591e26c8cc..0000000000
--- a/src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.spec.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-import { SearchFixedFilterService } from './search-fixed-filter.service';
-import { RequestService } from '../../../core/data/request.service';
-import { of as observableOf } from 'rxjs';
-import { RequestEntry } from '../../../core/data/request.reducer';
-import { FilteredDiscoveryQueryResponse } from '../../../core/cache/response.models';
-
-describe('SearchFixedFilterService', () => {
-  let service: SearchFixedFilterService;
-
-  const filterQuery = 'filter:query';
-
-  const requestServiceStub = Object.assign({
-    /* tslint:disable:no-empty */
-    configure: () => {
-    },
-    /* tslint:enable:no-empty */
-    generateRequestId: () => 'fake-id',
-    getByHref: () => observableOf(Object.assign(new RequestEntry(), {
-      response: new FilteredDiscoveryQueryResponse(filterQuery, 200, 'OK')
-    }))
-  }) as RequestService;
-
-  beforeEach(() => {
-    service = new SearchFixedFilterService();
-  });
-
-  describe('when getQueryByRelations is called', () => {
-    const relationType = 'isRelationOf';
-    const itemUUID = 'c5b277e6-2477-48bb-8993-356710c285f3';
-
-    it('should contain the relationType and itemUUID', () => {
-      const query = service.getQueryByRelations(relationType, itemUUID);
-      expect(query.length).toBeGreaterThan(relationType.length + itemUUID.length);
-      expect(query).toContain(relationType);
-      expect(query).toContain(itemUUID);
-    });
-  });
-});
diff --git a/src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.ts b/src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.ts
deleted file mode 100644
index e2ac7e1547..0000000000
--- a/src/app/+search-page/search-filters/search-filter/search-fixed-filter.service.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-import { Injectable } from '@angular/core';
-
-/**
- * Service for performing actions on the filtered-discovery-pages REST endpoint
- */
-@Injectable()
-export class SearchFixedFilterService {
-
-  /**
-   * Get the query for looking up items by relation type
-   * @param {string} relationType   Relation type
-   * @param {string} itemUUID       Item UUID
-   * @returns {string}              Query
-   */
-  getQueryByRelations(relationType: string, itemUUID: string): string {
-    return `query=relation.${relationType}:${itemUUID}`;
-  }
-
-  /**
-   * Get the filter for a relation with the item's UUID
-   * @param relationType    The type of relation e.g. 'isAuthorOfPublication'
-   * @param itemUUID        The item's UUID
-   */
-  getFilterByRelation(relationType: string, itemUUID: string): string {
-    return `f.${relationType}=${itemUUID}`;
-  }
-}
diff --git a/src/app/+search-page/search-labels/search-labels.component.html b/src/app/+search-page/search-labels/search-labels.component.html
deleted file mode 100644
index 6a668826da..0000000000
--- a/src/app/+search-page/search-labels/search-labels.component.html
+++ /dev/null
@@ -1,7 +0,0 @@
-<div class="row mb-3 mb-md-1">
-    <div class="labels col-sm-9 offset-sm-3">
-        <ng-container *ngFor="let key of ((appliedFilters | async) | dsObjectKeys)">
-            <ds-search-label *ngFor="let value of (appliedFilters | async)[key]" [inPlaceSearch]="inPlaceSearch" [key]="key" [value]="value" [appliedFilters]="appliedFilters"></ds-search-label>
-        </ng-container>
-    </div>
-</div>
diff --git a/src/app/+search-page/search-page-routing.module.ts b/src/app/+search-page/search-page-routing.module.ts
index d2c3b3be39..315e15a593 100644
--- a/src/app/+search-page/search-page-routing.module.ts
+++ b/src/app/+search-page/search-page-routing.module.ts
@@ -1,9 +1,9 @@
 import { NgModule } from '@angular/core';
 import { RouterModule } from '@angular/router';
 
-import { SearchPageComponent } from './search-page.component';
 import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
 import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
+import { SearchPageComponent } from './search-page.component';
 
 @NgModule({
   imports: [
diff --git a/src/app/+search-page/search-page.component.html b/src/app/+search-page/search-page.component.html
index 7efd22d5a9..5143d22809 100644
--- a/src/app/+search-page/search-page.component.html
+++ b/src/app/+search-page/search-page.component.html
@@ -1,50 +1,2 @@
-<div class="container" *ngIf="(isXsOrSm$ | async)">
-  <div class="row">
-    <div class="col-12">
-      <ng-template *ngTemplateOutlet="searchForm"></ng-template>
-    </div>
-  </div>
-</div>
-<ds-page-with-sidebar [id]="'search-page'" [sidebarContent]="sidebarContent">
-  <div class="row">
-      <div class="col-12" *ngIf="!(isXsOrSm$ | async)">
-        <ng-template *ngTemplateOutlet="searchForm"></ng-template>
-      </div>
-      <div id="search-content" class="col-12">
-          <div class="d-block d-md-none search-controls clearfix">
-              <ds-view-mode-switch [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}}
-              </button>
-          </div>
-          <ds-search-results [searchResults]="resultsRD$ | async"
-                             [searchConfig]="searchOptions$ | async"
-                             [configuration]="configuration$ | async"
-                             [disableHeader]="!searchEnabled"></ds-search-results>
-      </div>
-    </div>
-</ds-page-with-sidebar>
-
-<ng-template #sidebarContent>
-  <ds-search-sidebar id="search-sidebar" *ngIf="!(isXsOrSm$ | async)"
-                     [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
-                     [inPlaceSearch]="inPlaceSearch"></ds-search-sidebar>
-  <ds-search-sidebar id="search-sidebar-sm" *ngIf="(isXsOrSm$ | async)"
-                     [resultCount]="(resultsRD$ | async)?.payload.totalElements"
-                     (toggleSidebar)="closeSidebar()"
-                     >
-  </ds-search-sidebar>
-</ng-template>
-
-<ng-template #searchForm>
-  <ds-search-form *ngIf="searchEnabled" id="search-form"
-                  [query]="(searchOptions$ | async)?.query"
-                  [scope]="(searchOptions$ | async)?.scope"
-                  [currentUrl]="searchLink"
-                  [scopes]="(scopeListRD$ | async)"
-                  [inPlaceSearch]="inPlaceSearch">
-  </ds-search-form>
-  <ds-search-labels *ngIf="searchEnabled" [inPlaceSearch]="inPlaceSearch"></ds-search-labels>
-</ng-template>
+<ds-search></ds-search>
+<ds-search-tracker></ds-search-tracker>
diff --git a/src/app/+search-page/search-page.component.ts b/src/app/+search-page/search-page.component.ts
index bf0c2e3e73..393af37c27 100644
--- a/src/app/+search-page/search-page.component.ts
+++ b/src/app/+search-page/search-page.component.ts
@@ -1,184 +1,12 @@
-import { ChangeDetectionStrategy, Component, Inject, Input, OnInit } from '@angular/core';
-import { BehaviorSubject, Observable, of as observableOf, Subscription } from 'rxjs';
-import { startWith, switchMap, } from 'rxjs/operators';
-import { PaginatedList } from '../core/data/paginated-list';
-import { RemoteData } from '../core/data/remote-data';
-import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { pushInOut } from '../shared/animations/push';
-import { HostWindowService } from '../shared/host-window.service';
-import { PaginatedSearchOptions } from './paginated-search-options.model';
-import { SearchResult } from './search-result.model';
-import { SearchService } from './search-service/search.service';
-import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { hasValue, isNotEmpty } from '../shared/empty.util';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
-import { getSucceededRemoteData } from '../core/shared/operators';
-import { RouteService } from '../core/services/route.service';
-import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
-
-export const SEARCH_ROUTE = '/search';
-
-/**
- * This component renders a simple item page.
- * The route parameter 'id' is used to request the item it represents.
- * All fields of the item that should be displayed, are defined in its template.
- */
+import { Component } from '@angular/core';
 
 @Component({
   selector: 'ds-search-page',
-  styleUrls: ['./search-page.component.scss'],
   templateUrl: './search-page.component.html',
-  changeDetection: ChangeDetectionStrategy.OnPush,
-  animations: [pushInOut],
-  providers: [
-    {
-      provide: SEARCH_CONFIG_SERVICE,
-      useClass: SearchConfigurationService
-    }
-  ]
 })
-
 /**
  * This component represents the whole search page
  * It renders search results depending on the current search options
  */
-export class SearchPageComponent implements OnInit {
-  /**
-   * The current search results
-   */
-  resultsRD$: BehaviorSubject<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> = new BehaviorSubject(null);
-
-  /**
-   * The current paginated search options
-   */
-  searchOptions$: Observable<PaginatedSearchOptions>;
-
-  /**
-   * The current relevant scopes
-   */
-  scopeListRD$: Observable<DSpaceObject[]>;
-
-  /**
-   * Emits true if were on a small screen
-   */
-  isXsOrSm$: Observable<boolean>;
-
-  /**
-   * Subscription to unsubscribe from
-   */
-  sub: Subscription;
-
-  /**
-   * True when the search component should show results on the current page
-   */
-  @Input() inPlaceSearch = true;
-
-  /**
-   * Whether or not the search bar should be visible
-   */
-  @Input()
-  searchEnabled = true;
-
-  /**
-   * The width of the sidebar (bootstrap columns)
-   */
-  @Input()
-  sideBarWidth = 3;
-
-  /**
-   * The currently applied configuration (determines title of search)
-   */
-  @Input()
-  configuration$: Observable<string>;
-
-  /**
-   * Link to the search page
-   */
-  searchLink: string;
-
-  /**
-   * Observable for whether or not the sidebar is currently collapsed
-   */
-  isSidebarCollapsed$: Observable<boolean>;
-
-  constructor(protected service: SearchService,
-              protected sidebarService: SidebarService,
-              protected windowService: HostWindowService,
-              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
-              protected routeService: RouteService) {
-    this.isXsOrSm$ = this.windowService.isXsOrSm();
-  }
-
-  /**
-   * Listening to changes in the paginated search options
-   * If something changes, update the search results
-   *
-   * Listen to changes in the scope
-   * If something changes, update the list of scopes for the dropdown
-   */
-  ngOnInit(): void {
-    this.isSidebarCollapsed$ = this.isSidebarCollapsed();
-    this.searchLink = this.getSearchLink();
-    this.searchOptions$ = this.getSearchOptions();
-    this.sub = this.searchOptions$.pipe(
-      switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData(), startWith(undefined))))
-      .subscribe((results) => {
-        this.resultsRD$.next(results);
-      });
-    this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
-      switchMap((scopeId) => this.service.getScopes(scopeId))
-    );
-    if (!isNotEmpty(this.configuration$)) {
-      this.configuration$ = this.routeService.getRouteParameterValue('configuration');
-    }
-  }
-
-  /**
-   * Get the current paginated search options
-   * @returns {Observable<PaginatedSearchOptions>}
-   */
-  protected getSearchOptions(): Observable<PaginatedSearchOptions> {
-    return this.searchConfigService.paginatedSearchOptions;
-  }
-
-  /**
-   * Set the sidebar to a collapsed state
-   */
-  public closeSidebar(): void {
-    this.sidebarService.collapse()
-  }
-
-  /**
-   * Set the sidebar to an expanded state
-   */
-  public openSidebar(): void {
-    this.sidebarService.expand();
-  }
-
-  /**
-   * Check if the sidebar is collapsed
-   * @returns {Observable<boolean>} emits true if the sidebar is currently collapsed, false if it is expanded
-   */
-  private isSidebarCollapsed(): Observable<boolean> {
-    return this.sidebarService.isCollapsed;
-  }
-
-  /**
-   * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
-   */
-  private getSearchLink(): string {
-    if (this.inPlaceSearch) {
-      return './';
-    }
-    return this.service.getSearchLink();
-  }
-
-  /**
-   * Unsubscribe from the subscription
-   */
-  ngOnDestroy(): void {
-    if (hasValue(this.sub)) {
-      this.sub.unsubscribe();
-    }
-  }
+export class SearchPageComponent {
 }
diff --git a/src/app/+search-page/search-page.module.ts b/src/app/+search-page/search-page.module.ts
index b846771198..456446781c 100644
--- a/src/app/+search-page/search-page.module.ts
+++ b/src/app/+search-page/search-page.module.ts
@@ -3,65 +3,23 @@ import { CommonModule } from '@angular/common';
 import { CoreModule } from '../core/core.module';
 import { SharedModule } from '../shared/shared.module';
 import { SearchPageRoutingModule } from './search-page-routing.module';
-import { SearchPageComponent } from './search-page.component';
-import { SearchResultsComponent } from './search-results/search-results.component';
-import { CommunitySearchResultGridElementComponent } from '../shared/object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component'
-import { CollectionSearchResultGridElementComponent } from '../shared/object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
-import { SearchSidebarComponent } from './search-sidebar/search-sidebar.component';
+import { SearchComponent } from './search.component';
 import { SidebarService } from '../shared/sidebar/sidebar.service';
-import { SidebarEffects } from '../shared/sidebar/sidebar-effects.service';
-import { SearchSettingsComponent } from './search-settings/search-settings.component';
 import { EffectsModule } from '@ngrx/effects';
-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 { SearchFilterService } from './search-filters/search-filter/search-filter.service';
-import { SearchFixedFilterService } from './search-filters/search-filter/search-fixed-filter.service';
-import { SearchLabelsComponent } from './search-labels/search-labels.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 { SearchFacetFilterWrapperComponent } from './search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
-import { SearchBooleanFilterComponent } from './search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
-import { SearchHierarchyFilterComponent } from './search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
-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 { SearchSwitchConfigurationComponent } from './search-switch-configuration/search-switch-configuration.component';
-import { SearchAuthorityFilterComponent } from './search-filters/search-filter/search-authority-filter/search-authority-filter.component';
-import { SearchLabelComponent } from './search-labels/search-label/search-label.component';
 import { ConfigurationSearchPageComponent } from './configuration-search-page.component';
 import { ConfigurationSearchPageGuard } from './configuration-search-page.guard';
-import { FilteredSearchPageComponent } from './filtered-search-page.component';
+import { SearchTrackerComponent } from './search-tracker.component';
+import { StatisticsModule } from '../statistics/statistics.module';
+import { SearchPageComponent } from './search-page.component';
 import { SidebarFilterService } from '../shared/sidebar/filter/sidebar-filter.service';
-
-const effects = [
-  SidebarEffects
-];
+import { SearchFilterService } from '../core/shared/search/search-filter.service';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
 
 const components = [
   SearchPageComponent,
-  SearchResultsComponent,
-  SearchSidebarComponent,
-  SearchSettingsComponent,
-  SearchFiltersComponent,
-  SearchFilterComponent,
-  SearchFacetFilterComponent,
-  SearchLabelsComponent,
-  SearchLabelComponent,
-  SearchFacetFilterComponent,
-  SearchFacetFilterWrapperComponent,
-  SearchRangeFilterComponent,
-  SearchTextFilterComponent,
-  SearchHierarchyFilterComponent,
-  SearchBooleanFilterComponent,
-  SearchFacetOptionComponent,
-  SearchFacetSelectedOptionComponent,
-  SearchFacetRangeOptionComponent,
-  SearchSwitchConfigurationComponent,
-  SearchAuthorityFilterComponent,
-  FilteredSearchPageComponent,
-  ConfigurationSearchPageComponent
+  SearchComponent,
+  ConfigurationSearchPageComponent,
+  SearchTrackerComponent
 ];
 
 @NgModule({
@@ -69,29 +27,17 @@ const components = [
     SearchPageRoutingModule,
     CommonModule,
     SharedModule,
-    EffectsModule.forFeature(effects),
     CoreModule.forRoot(),
+    StatisticsModule.forRoot(),
   ],
   declarations: components,
   providers: [
     SidebarService,
     SidebarFilterService,
     SearchFilterService,
-    SearchFixedFilterService,
     ConfigurationSearchPageGuard,
     SearchConfigurationService
   ],
-  entryComponents: [
-    SearchFacetFilterComponent,
-    SearchRangeFilterComponent,
-    SearchTextFilterComponent,
-    SearchHierarchyFilterComponent,
-    SearchBooleanFilterComponent,
-    SearchFacetOptionComponent,
-    SearchFacetSelectedOptionComponent,
-    SearchFacetRangeOptionComponent,
-    SearchAuthorityFilterComponent
-  ],
   exports: components
 })
 
diff --git a/src/app/+search-page/search-result.model.ts b/src/app/+search-page/search-result.model.ts
deleted file mode 100644
index 95359209d9..0000000000
--- a/src/app/+search-page/search-result.model.ts
+++ /dev/null
@@ -1,26 +0,0 @@
-import { DSpaceObject } from '../core/shared/dspace-object.model';
-import { MetadataMap } from '../core/shared/metadata.models';
-import { ListableObject } from '../shared/object-collection/shared/listable-object.model';
-import { GenericConstructor } from '../core/shared/generic-constructor';
-
-/**
- * Represents a search result object of a certain (<T>) DSpaceObject
- */
-export class SearchResult<T extends DSpaceObject> implements ListableObject {
-  /**
-   * The DSpaceObject that was found
-   */
-  indexableObject: T;
-
-  /**
-   * The metadata that was used to find this item, hithighlighted
-   */
-  hitHighlights: MetadataMap;
-
-  /**
-   * Method that returns as which type of object this object should be rendered
-   */
-  getRenderTypes(): Array<string | GenericConstructor<ListableObject>> {
-    return [this.constructor as GenericConstructor<ListableObject>];
-  }
-}
diff --git a/src/app/+search-page/search-results/search-results.component.html b/src/app/+search-page/search-results/search-results.component.html
deleted file mode 100644
index c08a4f023f..0000000000
--- a/src/app/+search-page/search-results/search-results.component.html
+++ /dev/null
@@ -1,19 +0,0 @@
-<h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h2>
-<div *ngIf="searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
-<ds-viewable-collection
-  [config]="searchConfig.pagination"
-  [sortConfig]="searchConfig.sort"
-  [objects]="searchResults"
-  [linkType]="linkType"
-  [hideGear]="true">
-</ds-viewable-collection></div>
-<ds-loading *ngIf="hasNoValue(searchResults) || hasNoValue(searchResults.payload) || searchResults.isLoading" message="{{'loading.search-results' | translate}}"></ds-loading>
-<ds-error *ngIf="searchResults?.hasFailed && (!searchResults?.error || searchResults?.error?.statusCode != 400)" message="{{'error.search-results' | translate}}"></ds-error>
-<div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.error?.statusCode == 400">
-    {{ 'search.results.no-results' | translate }}
-    <a [routerLink]="['/search']"
-      [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
-      queryParamsHandling="merge">
-      {{"search.results.no-results-link" | translate}}
-    </a>
-</div> 
diff --git a/src/app/+search-page/search-settings/search-settings.component.html b/src/app/+search-page/search-settings/search-settings.component.html
deleted file mode 100644
index d8878982b4..0000000000
--- a/src/app/+search-page/search-settings/search-settings.component.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<ng-container *ngVar="(searchOptions$ | async) as config">
-  <h3>{{ 'search.sidebar.settings.title' | translate}}</h3>
-
-  <div class="result-order-settings">
-    <ds-sidebar-dropdown
-      *ngIf="config?.sort"
-      [id]="'search-sidebar-sort'"
-      [label]="'search.sidebar.settings.sort-by'"
-      (change)="reloadOrder($event)"
-    >
-      <option *ngFor="let sortOption of searchOptionPossibilities"
-              [value]="sortOption.field + ',' + sortOption.direction.toString()"
-              [selected]="sortOption.field === config?.sort.field && sortOption.direction === (config?.sort.direction)? 'selected': null">
-        {{'sorting.' + sortOption.field + '.' + sortOption.direction | translate}}
-      </option>
-    </ds-sidebar-dropdown>
-  </div>
-
-  <div class="page-size-settings">
-    <ds-sidebar-dropdown
-      [id]="'search-sidebar-rpp'"
-      [label]="'search.sidebar.settings.rpp'"
-      (change)="reloadRPP($event)"
-    >
-      <option *ngFor="let pageSizeOption of config?.pagination.pageSizeOptions"
-              [value]="pageSizeOption"
-              [selected]="pageSizeOption === +config?.pagination.pageSize ? 'selected': null">
-        {{pageSizeOption}}
-      </option>
-    </ds-sidebar-dropdown>
-  </div>
-</ng-container>
diff --git a/src/app/+search-page/search-tracker.component.html b/src/app/+search-page/search-tracker.component.html
new file mode 100644
index 0000000000..c0c0ffe181
--- /dev/null
+++ b/src/app/+search-page/search-tracker.component.html
@@ -0,0 +1 @@
+&nbsp;
diff --git a/src/app/+search-page/search-tracker.component.scss b/src/app/+search-page/search-tracker.component.scss
new file mode 100644
index 0000000000..c76cafbe44
--- /dev/null
+++ b/src/app/+search-page/search-tracker.component.scss
@@ -0,0 +1,3 @@
+:host {
+  display: none
+}
diff --git a/src/app/+search-page/search-tracker.component.ts b/src/app/+search-page/search-tracker.component.ts
new file mode 100644
index 0000000000..7e5aa49165
--- /dev/null
+++ b/src/app/+search-page/search-tracker.component.ts
@@ -0,0 +1,90 @@
+import { Component, Inject, OnInit } from '@angular/core';
+import { Angulartics2 } from 'angulartics2';
+import { filter, map, switchMap } from 'rxjs/operators';
+import { SearchComponent } from './search.component';
+import { SidebarService } from '../shared/sidebar/sidebar.service';
+import { HostWindowService } from '../shared/host-window.service';
+import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
+import { RouteService } from '../core/services/route.service';
+import { hasValue } from '../shared/empty.util';
+import { SearchSuccessResponse } from '../core/cache/response.models';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { SearchService } from '../core/shared/search/search.service';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
+import { SearchQueryResponse } from '../shared/search/search-query-response.model';
+import { Router } from '@angular/router';
+
+/**
+ * This component triggers a page view statistic
+ */
+@Component({
+  selector: 'ds-search-tracker',
+  styleUrls: ['./search-tracker.component.scss'],
+  templateUrl: './search-tracker.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ]
+})
+export class SearchTrackerComponent extends SearchComponent implements OnInit {
+
+  constructor(
+    protected service: SearchService,
+    protected sidebarService: SidebarService,
+    protected windowService: HostWindowService,
+    @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
+    protected routeService: RouteService,
+    public angulartics2: Angulartics2,
+    protected router: Router
+  ) {
+    super(service, sidebarService, windowService, searchConfigService, routeService, router);
+  }
+
+  ngOnInit(): void {
+    // super.ngOnInit();
+    this.getSearchOptions().pipe(
+      switchMap((options) => this.service.searchEntries(options)
+        .pipe(
+          filter((entry) =>
+            hasValue(entry.requestEntry)
+            && hasValue(entry.requestEntry.response)
+            && entry.requestEntry.response.isSuccessful === true
+          ),
+          map((entry) => ({
+            searchOptions: entry.searchOptions,
+            response: (entry.requestEntry.response as SearchSuccessResponse).results
+          })),
+        )
+      )
+    )
+      .subscribe((entry) => {
+        const config: PaginatedSearchOptions = entry.searchOptions;
+        const searchQueryResponse: SearchQueryResponse = entry.response;
+        const filters: Array<{ filter: string, operator: string, value: string, label: string; }> = [];
+        const appliedFilters = searchQueryResponse.appliedFilters || [];
+        for (let i = 0, filtersLength = appliedFilters.length; i < filtersLength; i++) {
+          const appliedFilter = appliedFilters[i];
+          filters.push(appliedFilter);
+        }
+        this.angulartics2.eventTrack.next({
+          action: 'search',
+          properties: {
+            searchOptions: config,
+            page: {
+              size: config.pagination.size, // same as searchQueryResponse.page.elementsPerPage
+              totalElements: searchQueryResponse.page.totalElements,
+              totalPages: searchQueryResponse.page.totalPages,
+              number: config.pagination.currentPage, // same as searchQueryResponse.page.currentPage
+            },
+            sort: {
+              by: config.sort.field,
+              order: config.sort.direction
+            },
+            filters: filters,
+          },
+        })
+      });
+  }
+}
diff --git a/src/app/+search-page/search.component.html b/src/app/+search-page/search.component.html
new file mode 100644
index 0000000000..36879f33d4
--- /dev/null
+++ b/src/app/+search-page/search.component.html
@@ -0,0 +1,54 @@
+<div class="container" *ngIf="(isXsOrSm$ | async)">
+  <div class="row">
+    <div class="col-12">
+      <ng-template *ngTemplateOutlet="searchForm"></ng-template>
+    </div>
+  </div>
+</div>
+<ds-page-with-sidebar [id]="'search-page'" [sidebarContent]="sidebarContent">
+  <div class="row">
+    <div class="col-12" *ngIf="!(isXsOrSm$ | async)">
+      <ng-template *ngTemplateOutlet="searchForm"></ng-template>
+    </div>
+    <div id="search-content" class="col-12">
+      <div class="d-block d-md-none search-controls clearfix">
+        <ds-view-mode-switch [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}}
+        </button>
+      </div>
+      <ds-search-results [searchResults]="resultsRD$ | async"
+                         [searchConfig]="searchOptions$ | async"
+                         [configuration]="configuration$ | async"
+                         [disableHeader]="!searchEnabled"></ds-search-results>
+    </div>
+  </div>
+</ds-page-with-sidebar>
+
+<ng-template #sidebarContent>
+  <ds-search-sidebar id="search-sidebar" *ngIf="!(isXsOrSm$ | async)"
+                     [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
+                     [inPlaceSearch]="inPlaceSearch"></ds-search-sidebar>
+  <ds-search-sidebar id="search-sidebar-sm" *ngIf="(isXsOrSm$ | async)"
+                     [resultCount]="(resultsRD$ | async)?.payload.totalElements"
+                     (toggleSidebar)="closeSidebar()"
+  >
+  </ds-search-sidebar>
+</ng-template>
+
+<ng-template #searchForm>
+  <ds-search-form *ngIf="searchEnabled" id="search-form"
+                  [query]="(searchOptions$ | async)?.query"
+                  [scope]="(searchOptions$ | async)?.scope"
+                  [currentUrl]="searchLink"
+                  [scopes]="(scopeListRD$ | async)"
+                  [inPlaceSearch]="inPlaceSearch">
+  </ds-search-form>
+  <div class="row mb-3 mb-md-1">
+    <div class="labels col-sm-9 offset-sm-3">
+      <ds-search-labels *ngIf="searchEnabled" [inPlaceSearch]="inPlaceSearch"></ds-search-labels>
+    </div>
+  </div>
+</ng-template>
diff --git a/src/app/+search-page/search-page.component.scss b/src/app/+search-page/search.component.scss
similarity index 100%
rename from src/app/+search-page/search-page.component.scss
rename to src/app/+search-page/search.component.scss
diff --git a/src/app/+search-page/search-page.component.spec.ts b/src/app/+search-page/search.component.spec.ts
similarity index 83%
rename from src/app/+search-page/search-page.component.spec.ts
rename to src/app/+search-page/search.component.spec.ts
index 9f17beeab3..2fe4128ba0 100644
--- a/src/app/+search-page/search-page.component.spec.ts
+++ b/src/app/+search-page/search.component.spec.ts
@@ -10,28 +10,26 @@ import { SortDirection, SortOptions } from '../core/cache/models/sort-options.mo
 import { CommunityDataService } from '../core/data/community-data.service';
 import { HostWindowService } from '../shared/host-window.service';
 import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { SearchPageComponent } from './search-page.component';
-import { SearchService } from './search-service/search.service';
+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 { SidebarService } from '../shared/sidebar/sidebar.service';
-import { SearchFilterService } from './search-filters/search-filter/search-filter.service';
-import { SearchConfigurationService } from './search-service/search-configuration.service';
-import { RemoteData } from '../core/data/remote-data';
+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 { SearchConfigurationServiceStub } from '../shared/testing/search-configuration-service-stub';
-import { PaginatedSearchOptions } from './paginated-search-options.model';
-import { SearchFixedFilterService } from './search-filters/search-filter/search-fixed-filter.service';
 import { createSuccessfulRemoteDataObject$ } from '../shared/testing/utils';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
 
-let comp: SearchPageComponent;
-let fixture: ComponentFixture<SearchPageComponent>;
+let comp: SearchComponent;
+let fixture: ComponentFixture<SearchComponent>;
 let searchServiceObject: SearchService;
 let searchConfigurationServiceObject: SearchConfigurationService;
-const store: Store<SearchPageComponent> = jasmine.createSpyObj('store', {
+const store: Store<SearchComponent> = jasmine.createSpyObj('store', {
   /* tslint:disable:no-empty */
   dispatch: {},
   /* tslint:enable:no-empty */
@@ -89,7 +87,6 @@ const routeServiceStub = {
     return observableOf('')
   }
 };
-const mockFixedFilterService: SearchFixedFilterService = {} as SearchFixedFilterService;
 
 export function configureSearchComponentTestingModule(compType) {
   TestBed.configureTestingModule({
@@ -122,10 +119,6 @@ export function configureSearchComponentTestingModule(compType) {
         provide: SearchFilterService,
         useValue: {}
       },
-      {
-        provide: SearchFixedFilterService,
-        useValue: mockFixedFilterService
-      },
       {
         provide: SearchConfigurationService,
         useValue: {
@@ -150,14 +143,15 @@ export function configureSearchComponentTestingModule(compType) {
   }).compileComponents();
 }
 
-describe('SearchPageComponent', () => {
+describe('SearchComponent', () => {
   beforeEach(async(() => {
-    configureSearchComponentTestingModule(SearchPageComponent);
+    configureSearchComponentTestingModule(SearchComponent);
   }));
 
   beforeEach(() => {
-    fixture = TestBed.createComponent(SearchPageComponent);
-    comp = fixture.componentInstance; // SearchPageComponent test instance
+    fixture = TestBed.createComponent(SearchComponent);
+    comp = fixture.componentInstance; // SearchComponent test instance
+    comp.inPlaceSearch = false;
     fixture.detectChanges();
     searchServiceObject = (comp as any).service;
     searchConfigurationServiceObject = (comp as any).searchConfigService;
diff --git a/src/app/+search-page/search.component.ts b/src/app/+search-page/search.component.ts
new file mode 100644
index 0000000000..b27ebf625f
--- /dev/null
+++ b/src/app/+search-page/search.component.ts
@@ -0,0 +1,178 @@
+import { ChangeDetectionStrategy, Component, Inject, Input, OnInit } from '@angular/core';
+import { BehaviorSubject, Observable, Subscription } from 'rxjs';
+import { startWith, switchMap, } from 'rxjs/operators';
+import { PaginatedList } from '../core/data/paginated-list';
+import { RemoteData } from '../core/data/remote-data';
+import { DSpaceObject } from '../core/shared/dspace-object.model';
+import { pushInOut } from '../shared/animations/push';
+import { HostWindowService } from '../shared/host-window.service';
+import { SidebarService } from '../shared/sidebar/sidebar.service';
+import { hasValue, isNotEmpty } from '../shared/empty.util';
+import { getSucceededRemoteData } from '../core/shared/operators';
+import { RouteService } from '../core/services/route.service';
+import { SEARCH_CONFIG_SERVICE } from '../+my-dspace-page/my-dspace-page.component';
+import { PaginatedSearchOptions } from '../shared/search/paginated-search-options.model';
+import { SearchResult } from '../shared/search/search-result.model';
+import { SearchConfigurationService } from '../core/shared/search/search-configuration.service';
+import { SearchService } from '../core/shared/search/search.service';
+import { currentPath } from '../shared/utils/route.utils';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'ds-search',
+  styleUrls: ['./search.component.scss'],
+  templateUrl: './search.component.html',
+  changeDetection: ChangeDetectionStrategy.OnPush,
+  animations: [pushInOut],
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ]
+})
+
+/**
+ * This component renders a sidebar, a search input bar and the search results.
+ */
+export class SearchComponent implements OnInit {
+  /**
+   * The current search results
+   */
+  resultsRD$: BehaviorSubject<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> = new BehaviorSubject(null);
+
+  /**
+   * The current paginated search options
+   */
+  searchOptions$: Observable<PaginatedSearchOptions>;
+
+  /**
+   * The current relevant scopes
+   */
+  scopeListRD$: Observable<DSpaceObject[]>;
+
+  /**
+   * Emits true if were on a small screen
+   */
+  isXsOrSm$: Observable<boolean>;
+
+  /**
+   * Subscription to unsubscribe from
+   */
+  sub: Subscription;
+
+  /**
+   * True when the search component should show results on the current page
+   */
+  @Input() inPlaceSearch = true;
+
+  /**
+   * Whether or not the search bar should be visible
+   */
+  @Input()
+  searchEnabled = true;
+
+  /**
+   * The width of the sidebar (bootstrap columns)
+   */
+  @Input()
+  sideBarWidth = 3;
+
+  /**
+   * The currently applied configuration (determines title of search)
+   */
+  @Input()
+  configuration$: Observable<string>;
+
+  /**
+   * Link to the search page
+   */
+  searchLink: string;
+
+  /**
+   * Observable for whether or not the sidebar is currently collapsed
+   */
+  isSidebarCollapsed$: Observable<boolean>;
+
+  constructor(protected service: SearchService,
+              protected sidebarService: SidebarService,
+              protected windowService: HostWindowService,
+              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService,
+              protected routeService: RouteService,
+              protected router: Router) {
+    this.isXsOrSm$ = this.windowService.isXsOrSm();
+  }
+
+  /**
+   * Listening to changes in the paginated search options
+   * If something changes, update the search results
+   *
+   * Listen to changes in the scope
+   * If something changes, update the list of scopes for the dropdown
+   */
+  ngOnInit(): void {
+    this.isSidebarCollapsed$ = this.isSidebarCollapsed();
+    this.searchLink = this.getSearchLink();
+    this.searchOptions$ = this.getSearchOptions();
+    this.sub = this.searchOptions$.pipe(
+      switchMap((options) => this.service.search(options).pipe(getSucceededRemoteData(), startWith(undefined))))
+      .subscribe((results) => {
+        this.resultsRD$.next(results);
+      });
+    this.scopeListRD$ = this.searchConfigService.getCurrentScope('').pipe(
+      switchMap((scopeId) => this.service.getScopes(scopeId))
+    );
+    if (!isNotEmpty(this.configuration$)) {
+      this.configuration$ = this.routeService.getRouteParameterValue('configuration');
+    }
+  }
+
+  /**
+   * Get the current paginated search options
+   * @returns {Observable<PaginatedSearchOptions>}
+   */
+  protected getSearchOptions(): Observable<PaginatedSearchOptions> {
+    return this.searchConfigService.paginatedSearchOptions;
+  }
+
+  /**
+   * Set the sidebar to a collapsed state
+   */
+  public closeSidebar(): void {
+    this.sidebarService.collapse()
+  }
+
+  /**
+   * Set the sidebar to an expanded state
+   */
+  public openSidebar(): void {
+    this.sidebarService.expand();
+  }
+
+  /**
+   * Check if the sidebar is collapsed
+   * @returns {Observable<boolean>} emits true if the sidebar is currently collapsed, false if it is expanded
+   */
+  private isSidebarCollapsed(): Observable<boolean> {
+    return this.sidebarService.isCollapsed;
+  }
+
+  /**
+   * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
+   */
+  private getSearchLink(): string {
+    if (this.inPlaceSearch) {
+      return currentPath(this.router);
+    }
+    return this.service.getSearchLink();
+  }
+
+  /**
+   * Unsubscribe from the subscription
+   */
+  ngOnDestroy(): void {
+    if (hasValue(this.sub)) {
+      this.sub.unsubscribe();
+    }
+  }
+}
diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts
index 5085633a5b..bd29db4ab8 100644
--- a/src/app/app-routing.module.ts
+++ b/src/app/app-routing.module.ts
@@ -27,6 +27,7 @@ export function getAdminModulePath() {
     RouterModule.forRoot([
       { path: '', redirectTo: '/home', pathMatch: 'full' },
       { path: 'home', loadChildren: './+home-page/home-page.module#HomePageModule' },
+      { path: 'community-list', loadChildren: './community-list-page/community-list-page.module#CommunityListPageModule' },
       { path: 'id', loadChildren: './+lookup-by-id/lookup-by-id.module#LookupIdModule' },
       { path: 'handle', loadChildren: './+lookup-by-id/lookup-by-id.module#LookupIdModule' },
       { path: COMMUNITY_MODULE_PATH, loadChildren: './+community-page/community-page.module#CommunityPageModule' },
diff --git a/src/app/app.component.spec.ts b/src/app/app.component.spec.ts
index 5b78e3462f..a578c0d8c1 100644
--- a/src/app/app.component.spec.ts
+++ b/src/app/app.component.spec.ts
@@ -20,7 +20,7 @@ import { Store, StoreModule } from '@ngrx/store';
 // Load the implementations that should be tested
 import { AppComponent } from './app.component';
 
-import { HostWindowState } from './shared/host-window.reducer';
+import { HostWindowState } from './shared/search/host-window.reducer';
 import { HostWindowResizeAction } from './shared/host-window.actions';
 
 import { MetadataService } from './core/metadata/metadata.service';
@@ -46,6 +46,7 @@ import { MockActivatedRoute } from './shared/mocks/mock-active-router';
 import { MockRouter } from './shared/mocks/mock-router';
 import { MockCookieService } from './shared/mocks/mock-cookie.service';
 import { CookieService } from './core/services/cookie.service';
+import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 
 let comp: AppComponent;
 let fixture: ComponentFixture<AppComponent>;
@@ -74,6 +75,7 @@ describe('App component', () => {
         { provide: NativeWindowService, useValue: new NativeWindowRef() },
         { provide: MetadataService, useValue: new MockMetadataService() },
         { provide: Angulartics2GoogleAnalytics, useValue: new AngularticsMock() },
+        { provide: Angulartics2DSpace, useValue: new AngularticsMock() },
         { provide: AuthService, useValue: new AuthServiceMock() },
         { provide: Router, useValue: new MockRouter() },
         { provide: ActivatedRoute, useValue: new MockActivatedRoute() },
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index 50baaf6e57..1f3da086c2 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -1,13 +1,5 @@
 import { filter, map, take } from 'rxjs/operators';
-import {
-  AfterViewInit,
-  ChangeDetectionStrategy,
-  Component,
-  HostListener,
-  Inject,
-  OnInit,
-  ViewEncapsulation
-} from '@angular/core';
+import { AfterViewInit, ChangeDetectionStrategy, Component, HostListener, Inject, OnInit, ViewEncapsulation } from '@angular/core';
 import { NavigationCancel, NavigationEnd, NavigationStart, Router } from '@angular/router';
 
 import { select, Store } from '@ngrx/store';
@@ -18,12 +10,11 @@ import { GLOBAL_CONFIG, GlobalConfig } from '../config';
 
 import { MetadataService } from './core/metadata/metadata.service';
 import { HostWindowResizeAction } from './shared/host-window.actions';
-import { HostWindowState } from './shared/host-window.reducer';
+import { HostWindowState } from './shared/search/host-window.reducer';
 import { NativeWindowRef, NativeWindowService } from './core/services/window.service';
 import { isAuthenticated } from './core/auth/selectors';
 import { AuthService } from './core/auth/auth.service';
 import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
-import { RouteService } from './core/services/route.service';
 import variables from '../styles/_exposed_variables.scss';
 import { CSSVariableService } from './shared/sass-helper/sass-helper.service';
 import { MenuService } from './shared/menu/menu.service';
@@ -34,6 +25,7 @@ import { HostWindowService } from './shared/host-window.service';
 import { Theme } from '../config/theme.inferface';
 import { isNotEmpty } from './shared/empty.util';
 import { CookieService } from './core/services/cookie.service';
+import { Angulartics2DSpace } from './statistics/angulartics/dspace-provider';
 
 export const LANG_COOKIE = 'language_cookie';
 
@@ -60,6 +52,7 @@ export class AppComponent implements OnInit, AfterViewInit {
     private store: Store<HostWindowState>,
     private metadata: MetadataService,
     private angulartics2GoogleAnalytics: Angulartics2GoogleAnalytics,
+    private angulartics2DSpace: Angulartics2DSpace,
     private authService: AuthService,
     private router: Router,
     private cssService: CSSVariableService,
@@ -89,6 +82,9 @@ export class AppComponent implements OnInit, AfterViewInit {
       }
     }
 
+    angulartics2GoogleAnalytics.startTracking();
+    angulartics2DSpace.startTracking();
+
     metadata.listenForRouteChange();
 
     if (config.debug) {
diff --git a/src/app/app.effects.ts b/src/app/app.effects.ts
index b4ddb24c8e..64573609c7 100644
--- a/src/app/app.effects.ts
+++ b/src/app/app.effects.ts
@@ -1,9 +1,13 @@
 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';
 
 export const appEffects = [
   StoreEffects,
   NavbarEffects,
   NotificationsEffects,
+  SidebarEffects,
+  RelationshipEffects
 ];
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 3d8bf0ed43..4b803608f3 100755
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -10,10 +10,14 @@ import { META_REDUCERS, MetaReducer, StoreModule } from '@ngrx/store';
 import { StoreDevtoolsModule } from '@ngrx/store-devtools';
 
 import { TranslateModule } from '@ngx-translate/core';
+import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
 
 import { storeFreeze } from 'ngrx-store-freeze';
 
 import { ENV_CONFIG, GLOBAL_CONFIG, GlobalConfig } from '../config';
+import { AdminSidebarSectionComponent } from './+admin/admin-sidebar/admin-sidebar-section/admin-sidebar-section.component';
+import { AdminSidebarComponent } from './+admin/admin-sidebar/admin-sidebar.component';
+import { ExpandableAdminSidebarSectionComponent } from './+admin/admin-sidebar/expandable-admin-sidebar-section/expandable-admin-sidebar-section.component';
 import { AppRoutingModule } from './app-routing.module';
 
 import { AppComponent } from './app.component';
@@ -23,23 +27,20 @@ import { appMetaReducers, debugMetaReducers } from './app.metareducers';
 import { appReducers, AppState } from './app.reducer';
 
 import { CoreModule } from './core/core.module';
-import { FooterComponent } from './footer/footer.component';
-import { HeaderComponent } from './header/header.component';
-import { PageNotFoundComponent } from './pagenotfound/pagenotfound.component';
-
-import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer';
-import { NotificationsBoardComponent } from './shared/notifications/notifications-board/notifications-board.component';
-import { NotificationComponent } from './shared/notifications/notification/notification.component';
-import { SharedModule } from './shared/shared.module';
-import { ScrollToModule } from '@nicky-lenaers/ngx-scroll-to';
-import { HeaderNavbarWrapperComponent } from './header-nav-wrapper/header-navbar-wrapper.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 { NavbarModule } from './navbar/navbar.module';
+import { ClientCookieService } from './core/services/client-cookie.service';
 import { JournalEntitiesModule } from './entity-groups/journal-entities/journal-entities.module';
 import { ResearchEntitiesModule } from './entity-groups/research-entities/research-entities.module';
-import { ClientCookieService } from './core/services/client-cookie.service';
+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 { SearchNavbarComponent } from './search-navbar/search-navbar.component';
+
+import { DSpaceRouterStateSerializer } from './shared/ngrx/dspace-router-state-serializer';
+import { NotificationComponent } from './shared/notifications/notification/notification.component';
+import { NotificationsBoardComponent } from './shared/notifications/notifications-board/notifications-board.component';
+import { SharedModule } from './shared/shared.module';
 
 export function getConfig() {
   return ENV_CONFIG;
@@ -76,7 +77,7 @@ const ENTITY_IMPORTS = [
 
 IMPORTS.push(
   StoreDevtoolsModule.instrument({
-    maxAge: 100,
+    maxAge: 1000,
     logOnly: ENV_CONFIG.production,
   })
 );
@@ -112,7 +113,8 @@ const DECLARATIONS = [
   FooterComponent,
   PageNotFoundComponent,
   NotificationComponent,
-  NotificationsBoardComponent
+  NotificationsBoardComponent,
+  SearchNavbarComponent,
 ];
 
 const EXPORTS = [
@@ -128,7 +130,7 @@ const EXPORTS = [
     ...PROVIDERS
   ],
   declarations: [
-    ...DECLARATIONS
+    ...DECLARATIONS,
   ],
   exports: [
     ...EXPORTS
diff --git a/src/app/app.reducer.ts b/src/app/app.reducer.ts
index f9dc813722..837fb9befd 100644
--- a/src/app/app.reducer.ts
+++ b/src/app/app.reducer.ts
@@ -1,23 +1,13 @@
-import { ActionReducerMap, createSelector, MemoizedSelector, State } from '@ngrx/store';
+import { ActionReducerMap, createSelector, MemoizedSelector } from '@ngrx/store';
 import * as fromRouter from '@ngrx/router-store';
-import { hostWindowReducer, HostWindowState } from './shared/host-window.reducer';
+
+import { hostWindowReducer, HostWindowState } from './shared/search/host-window.reducer';
+import { CommunityListReducer, CommunityListState } from './community-list-page/community-list.reducer';
 import { formReducer, FormState } from './shared/form/form.reducer';
-import {
-  SidebarState,
-  sidebarReducer
-} from './shared/sidebar/sidebar.reducer';
-import {
-  SidebarFilterState,
-  sidebarFilterReducer, SidebarFiltersState
-} from './shared/sidebar/filter/sidebar-filter.reducer';
-import {
-  filterReducer,
-  SearchFiltersState
-} from './+search-page/search-filters/search-filter/search-filter.reducer';
-import {
-  notificationsReducer,
-  NotificationsState
-} from './shared/notifications/notifications.reducers';
+import { sidebarReducer, SidebarState } from './shared/sidebar/sidebar.reducer';
+import { sidebarFilterReducer, SidebarFiltersState } from './shared/sidebar/filter/sidebar-filter.reducer';
+import { filterReducer, SearchFiltersState } from './shared/search/search-filters/search-filter/search-filter.reducer';
+import { notificationsReducer, NotificationsState } from './shared/notifications/notifications.reducers';
 import { truncatableReducer, TruncatablesState } from './shared/truncatable/truncatable.reducer';
 import {
   metadataRegistryReducer,
@@ -26,20 +16,21 @@ import {
 import { hasValue } from './shared/empty.util';
 import { cssVariablesReducer, CSSVariablesState } from './shared/sass-helper/sass-helper.reducer';
 import { menusReducer, MenusState } from './shared/menu/menu.reducer';
-import { historyReducer, HistoryState } from './shared/history/history.reducer';
 import {
-  bitstreamFormatReducer,
-  BitstreamFormatRegistryState
-} from './+admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+  selectableListReducer,
+  SelectableListsState
+} from './shared/object-list/selectable-list/selectable-list.reducer';
 import { ObjectSelectionListState, objectSelectionReducer } from './shared/object-select/object-select.reducer';
+import {
+  NameVariantListsState,
+  nameVariantReducer
+} from './shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer';
 
 export interface AppState {
   router: fromRouter.RouterReducerState;
-  history: HistoryState;
   hostWindow: HostWindowState;
   forms: FormState;
   metadataRegistry: MetadataRegistryState;
-  bitstreamFormats: BitstreamFormatRegistryState;
   notifications: NotificationsState;
   sidebar: SidebarState;
   sidebarFilter: SidebarFiltersState;
@@ -48,15 +39,16 @@ export interface AppState {
   cssVariables: CSSVariablesState;
   menus: MenusState;
   objectSelection: ObjectSelectionListState;
+  selectableLists: SelectableListsState;
+  relationshipLists: NameVariantListsState;
+  communityList: CommunityListState;
 }
 
 export const appReducers: ActionReducerMap<AppState> = {
   router: fromRouter.routerReducer,
-  history: historyReducer,
   hostWindow: hostWindowReducer,
   forms: formReducer,
   metadataRegistry: metadataRegistryReducer,
-  bitstreamFormats: bitstreamFormatReducer,
   notifications: notificationsReducer,
   sidebar: sidebarReducer,
   sidebarFilter: sidebarFilterReducer,
@@ -64,7 +56,10 @@ export const appReducers: ActionReducerMap<AppState> = {
   truncatable: truncatableReducer,
   cssVariables: cssVariablesReducer,
   menus: menusReducer,
-  objectSelection: objectSelectionReducer
+  objectSelection: objectSelectionReducer,
+  selectableLists: selectableListReducer,
+  relationshipLists: nameVariantReducer,
+  communityList: CommunityListReducer,
 };
 
 export const routerStateSelector = (state: AppState) => state.router;
diff --git a/src/app/community-list-page/community-list-datasource.ts b/src/app/community-list-page/community-list-datasource.ts
new file mode 100644
index 0000000000..3a9d9f2077
--- /dev/null
+++ b/src/app/community-list-page/community-list-datasource.ts
@@ -0,0 +1,40 @@
+import { CommunityListService, FlatNode } from './community-list-service';
+import { CollectionViewer, DataSource } from '@angular/cdk/typings/collections';
+import { BehaviorSubject, Observable, } from 'rxjs';
+import { finalize, take, } from 'rxjs/operators';
+
+/**
+ * DataSource object needed by a CDK Tree to render its nodes.
+ * The list of FlatNodes that this DataSource object represents gets created in the CommunityListService at
+ *    the beginning (initial page-limited top communities) and re-calculated any time the tree state changes
+ *    (a node gets expanded or page-limited result become larger by triggering a show more node)
+ */
+export class CommunityListDatasource implements DataSource<FlatNode> {
+
+  private communityList$ = new BehaviorSubject<FlatNode[]>([]);
+  public loading$ = new BehaviorSubject<boolean>(false);
+
+  constructor(private communityListService: CommunityListService) {
+  }
+
+  connect(collectionViewer: CollectionViewer): Observable<FlatNode[]> {
+    return this.communityList$.asObservable();
+  }
+
+  loadCommunities(expandedNodes: FlatNode[]) {
+    this.loading$.next(true);
+
+    this.communityListService.loadCommunities(expandedNodes).pipe(
+      take(1),
+      finalize(() => this.loading$.next(false)),
+    ).subscribe((flatNodes: FlatNode[]) => {
+      this.communityList$.next(flatNodes);
+    });
+  }
+
+  disconnect(collectionViewer: CollectionViewer): void {
+    this.communityList$.complete();
+    this.loading$.complete();
+  }
+
+}
diff --git a/src/app/community-list-page/community-list-page.component.html b/src/app/community-list-page/community-list-page.component.html
new file mode 100644
index 0000000000..08accdc0e5
--- /dev/null
+++ b/src/app/community-list-page/community-list-page.component.html
@@ -0,0 +1,4 @@
+<div class="container">
+  <h2>{{ 'communityList.title' | translate }}</h2>
+  <ds-community-list></ds-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
new file mode 100644
index 0000000000..0aa4afce7f
--- /dev/null
+++ b/src/app/community-list-page/community-list-page.component.spec.ts
@@ -0,0 +1,41 @@
+import { async, ComponentFixture, TestBed, inject } from '@angular/core/testing';
+
+import { CommunityListPageComponent } from './community-list-page.component';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { MockTranslateLoader } from '../shared/mocks/mock-translate-loader';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+
+describe('CommunityListPageComponent', () => {
+  let component: CommunityListPageComponent;
+  let fixture: ComponentFixture<CommunityListPageComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: MockTranslateLoader
+          },
+        }),
+      ],
+      declarations: [CommunityListPageComponent],
+      providers: [
+        CommunityListPageComponent,
+      ],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityListPageComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', inject([CommunityListPageComponent], (comp: CommunityListPageComponent) => {
+    expect(comp).toBeTruthy();
+  }));
+
+});
diff --git a/src/app/community-list-page/community-list-page.component.ts b/src/app/community-list-page/community-list-page.component.ts
new file mode 100644
index 0000000000..5ab3cce5de
--- /dev/null
+++ b/src/app/community-list-page/community-list-page.component.ts
@@ -0,0 +1,13 @@
+import { Component } from '@angular/core';
+
+/**
+ * Page with title and the community list tree, as described in community-list.component;
+ * navigated to with community-list.page.routing.module
+ */
+@Component({
+  selector: 'ds-community-list-page',
+  templateUrl: './community-list-page.component.html',
+})
+export class CommunityListPageComponent {
+
+}
diff --git a/src/app/community-list-page/community-list-page.module.ts b/src/app/community-list-page/community-list-page.module.ts
new file mode 100644
index 0000000000..2e3914fe03
--- /dev/null
+++ b/src/app/community-list-page/community-list-page.module.ts
@@ -0,0 +1,26 @@
+import { CommonModule } from '@angular/common';
+import { NgModule } from '@angular/core';
+import { SharedModule } from '../shared/shared.module';
+import { CommunityListPageComponent } from './community-list-page.component';
+import { CommunityListPageRoutingModule } from './community-list-page.routing.module';
+import { CommunityListComponent } from './community-list/community-list.component';
+import { CdkTreeModule } from '@angular/cdk/tree';
+
+/**
+ * The page which houses a title and the community list, as described in community-list.component
+ */
+@NgModule({
+  imports: [
+    CommonModule,
+    SharedModule,
+    CommunityListPageRoutingModule,
+    CdkTreeModule,
+  ],
+  declarations: [
+    CommunityListPageComponent,
+    CommunityListComponent
+  ]
+})
+export class CommunityListPageModule {
+
+}
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
new file mode 100644
index 0000000000..fe250cb96d
--- /dev/null
+++ b/src/app/community-list-page/community-list-page.routing.module.ts
@@ -0,0 +1,26 @@
+import { NgModule } from '@angular/core';
+import { RouterModule } from '@angular/router';
+import { CdkTreeModule } from '@angular/cdk/tree';
+
+import { CommunityListPageComponent } from './community-list-page.component';
+import { CommunityListService } from './community-list-service';
+
+/**
+ * RouterModule to help navigate to the page with the community list tree
+ */
+@NgModule({
+  imports: [
+    RouterModule.forChild([
+      {
+        path: '',
+        component: CommunityListPageComponent,
+        pathMatch: 'full',
+        data: { title: 'communityList.tabTitle' }
+      }
+    ]),
+    CdkTreeModule,
+  ],
+  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
new file mode 100644
index 0000000000..a150277d20
--- /dev/null
+++ b/src/app/community-list-page/community-list-service.spec.ts
@@ -0,0 +1,574 @@
+import { of as observableOf } from 'rxjs';
+import { TestBed, inject, async } from '@angular/core/testing';
+import { Store } from '@ngrx/store';
+import { AppState } from '../app.reducer';
+import { MockStore } from '../shared/testing/mock-store';
+import { CommunityListService, FlatNode, toFlatNode } from './community-list-service';
+import { CollectionDataService } from '../core/data/collection-data.service';
+import { PaginatedList } from '../core/data/paginated-list';
+import { PageInfo } from '../core/shared/page-info.model';
+import { CommunityDataService } from '../core/data/community-data.service';
+import {
+  createFailedRemoteDataObject$,
+  createSuccessfulRemoteDataObject$
+} from '../shared/testing/utils';
+import { Community } from '../core/shared/community.model';
+import { Collection } from '../core/shared/collection.model';
+import { take } from 'rxjs/operators';
+import { FindListOptions } from '../core/data/request.models';
+
+describe('CommunityListService', () => {
+  let store: MockStore<AppState>;
+  const standardElementsPerPage = 2;
+  let collectionDataServiceStub: any;
+  let communityDataServiceStub: any;
+  const mockSubcommunities1Page1 = [Object.assign(new Community(), {
+    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',
+    })
+  ];
+  const mockCollectionsPage1 = [
+    Object.assign(new Collection(), {
+      id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+      uuid: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+      name: 'Collection 1'
+    }),
+    Object.assign(new Collection(), {
+      id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
+      uuid: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
+      name: 'Collection 2'
+    })
+  ];
+  const mockCollectionsPage2 = [
+    Object.assign(new Collection(), {
+      id: 'a5159760-f362-4659-9e81-e3253ad91ede',
+      uuid: 'a5159760-f362-4659-9e81-e3253ad91ede',
+      name: 'Collection 3'
+    }),
+    Object.assign(new Collection(), {
+      id: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
+      uuid: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
+      name: 'Collection 4'
+    })
+  ];
+  const mockListOfTopCommunitiesPage1 = [
+    Object.assign(new Community(), {
+      id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+      uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+      subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+      collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+    }),
+    Object.assign(new Community(), {
+      id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+      uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+      subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+      collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
+    }),
+    Object.assign(new Community(), {
+      id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+      uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+      subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+      collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+    }),
+  ];
+  const mockListOfTopCommunitiesPage2 = [
+    Object.assign(new Community(), {
+      id: 'c2e04392-3b8a-4dfa-976d-d76fb1b8a4b6',
+      uuid: 'c2e04392-3b8a-4dfa-976d-d76fb1b8a4b6',
+      subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+      collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+    }),
+  ];
+  const mockTopCommunitiesWithChildrenArraysPage1 = [
+    {
+      id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+      uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+      subcommunities: mockSubcommunities1Page1,
+      collections: [],
+    },
+    {
+      id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+      uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+      subcommunities: [],
+      collections: [...mockCollectionsPage1, ...mockCollectionsPage2],
+    },
+    {
+      id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+      uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+      subcommunities: [],
+      collections: [],
+    }];
+  const mockTopCommunitiesWithChildrenArraysPage2 = [
+    {
+      id: 'c2e04392-3b8a-4dfa-976d-d76fb1b8a4b6',
+      uuid: 'c2e04392-3b8a-4dfa-976d-d76fb1b8a4b6',
+      subcommunities: [],
+      collections: [],
+    }];
+
+  const allCommunities = [...mockTopCommunitiesWithChildrenArraysPage1, ...mockTopCommunitiesWithChildrenArraysPage2, ...mockSubcommunities1Page1];
+
+  let service: CommunityListService;
+
+  beforeEach(async(() => {
+    communityDataServiceStub = {
+      findTop(options: FindListOptions = {}) {
+        const allTopComs = [...mockListOfTopCommunitiesPage1, ...mockListOfTopCommunitiesPage2];
+        let currentPage = options.currentPage;
+        const elementsPerPage = 3;
+        if (currentPage === undefined) {
+          currentPage = 1
+        }
+        const startPageIndex = (currentPage - 1) * elementsPerPage;
+        let endPageIndex = (currentPage * elementsPerPage);
+        if (endPageIndex > allTopComs.length) {
+          endPageIndex = allTopComs.length;
+        }
+        return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), allTopComs.slice(startPageIndex, endPageIndex)));
+      },
+      findByParent(parentUUID: string, options: FindListOptions = {}) {
+        const foundCom = allCommunities.find((community) => (community.id === parentUUID));
+        let currentPage = options.currentPage;
+        let elementsPerPage = options.elementsPerPage;
+        if (currentPage === undefined) {
+          currentPage = 1
+        }
+        if (elementsPerPage === 0) {
+          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), (foundCom.subcommunities as [Community])));
+        }
+        elementsPerPage = standardElementsPerPage;
+        if (foundCom !== undefined && foundCom.subcommunities !== undefined) {
+          const coms = foundCom.subcommunities as [Community];
+          const startPageIndex = (currentPage - 1) * elementsPerPage;
+          let endPageIndex = (currentPage * elementsPerPage);
+          if (endPageIndex > coms.length) {
+            endPageIndex = coms.length;
+          }
+          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), coms.slice(startPageIndex, endPageIndex)));
+        } else {
+          return createFailedRemoteDataObject$();
+        }
+      }
+    };
+    collectionDataServiceStub = {
+      findByParent(parentUUID: string, options: FindListOptions = {}) {
+        const foundCom = allCommunities.find((community) => (community.id === parentUUID));
+        let currentPage = options.currentPage;
+        let elementsPerPage = options.elementsPerPage;
+        if (currentPage === undefined) {
+          currentPage = 1
+        }
+        if (elementsPerPage === 0) {
+          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), (foundCom.collections as [Collection])));
+        }
+        elementsPerPage = standardElementsPerPage;
+        if (foundCom !== undefined && foundCom.collections !== undefined) {
+          const colls = foundCom.collections as [Collection];
+          const startPageIndex = (currentPage - 1) * elementsPerPage;
+          let endPageIndex = (currentPage * elementsPerPage);
+          if (endPageIndex > colls.length) {
+            endPageIndex = colls.length;
+          }
+          return createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), colls.slice(startPageIndex, endPageIndex)));
+        } else {
+          return createFailedRemoteDataObject$();
+        }
+      }
+    };
+    TestBed.configureTestingModule({
+      providers: [CommunityListService,
+        { provide: CollectionDataService, useValue: collectionDataServiceStub },
+        { provide: CommunityDataService, useValue: communityDataServiceStub },
+        { provide: Store, useValue: MockStore },
+      ],
+    });
+    store = TestBed.get(Store);
+    service = new CommunityListService(communityDataServiceStub, collectionDataServiceStub, store);
+  }));
+
+  afterAll(() => service = new CommunityListService(communityDataServiceStub, collectionDataServiceStub, store));
+
+  it('should create', inject([CommunityListService], (serviceIn: CommunityListService) => {
+    expect(serviceIn).toBeTruthy();
+  }));
+
+  describe('getNextPageTopCommunities', () => {
+    describe('also load in second page of top communities', () => {
+      let flatNodeList;
+      describe('None expanded: should return list containing only flatnodes of the test top communities page 1 and 2', () => {
+        let findTopSpy;
+        beforeEach(() => {
+          findTopSpy = spyOn(communityDataServiceStub, 'findTop').and.callThrough();
+          service.getNextPageTopCommunities();
+
+          const sub = service.loadCommunities(null)
+            .subscribe((value) => flatNodeList = value);
+          sub.unsubscribe();
+        });
+        it('flatnode list should contain just flatnodes of top community list page 1 and 2', () => {
+          expect(findTopSpy).toHaveBeenCalled();
+          expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length + mockListOfTopCommunitiesPage2.length);
+          mockListOfTopCommunitiesPage1.map((community) => {
+            expect(flatNodeList.find((flatnode) => (flatnode.id === community.id))).toBeTruthy();
+          });
+          mockListOfTopCommunitiesPage2.map((community) => {
+            expect(flatNodeList.find((flatnode) => (flatnode.id === community.id))).toBeTruthy();
+          });
+        });
+      });
+    });
+  });
+
+  describe('loadCommunities', () => {
+    describe('should transform all communities in a list of flatnodes with possible subcoms and collections as subflatnodes if they\'re expanded', () => {
+      let flatNodeList;
+      describe('None expanded: should return list containing only flatnodes of the test top communities', () => {
+        beforeEach(() => {
+          const sub = service.loadCommunities(null)
+            .pipe(take(1)).subscribe((value) => flatNodeList = value);
+          sub.unsubscribe();
+        });
+        it('length of flatnode list should be as big as top community list', () => {
+          expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length);
+        });
+        it('flatnode list should contain flatNode representations of top communities', () => {
+          mockListOfTopCommunitiesPage1.map((community) => {
+            expect(flatNodeList.find((flatnode) => (flatnode.id === community.id))).toBeTruthy();
+          });
+        });
+        it('none of the flatnodes in the list should be expanded', () => {
+          flatNodeList.map((flatnode: FlatNode) => {
+            expect(flatnode.isExpanded).toEqual(false);
+          });
+        });
+      });
+      describe('All top expanded, all page 1: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
+        beforeEach(() => {
+          const expandedNodes = [];
+          mockListOfTopCommunitiesPage1.map((community: Community) => {
+            const communityFlatNode = toFlatNode(community, observableOf(true), 0, true, null);
+            communityFlatNode.currentCollectionPage = 1;
+            communityFlatNode.currentCommunityPage = 1;
+            expandedNodes.push(communityFlatNode);
+          });
+          const sub = service.loadCommunities(expandedNodes)
+            .pipe(take(1)).subscribe((value) => flatNodeList = value);
+          sub.unsubscribe();
+        });
+        it('length of flatnode list should be as big as top community list and size of its possible page-limited children', () => {
+          expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length + mockSubcommunities1Page1.length + mockSubcommunities1Page1.length);
+        });
+        it('flatnode list should contain flatNode representations of all page-limited children', () => {
+          mockSubcommunities1Page1.map((subcommunity) => {
+            expect(flatNodeList.find((flatnode) => (flatnode.id === subcommunity.id))).toBeTruthy();
+          });
+          mockCollectionsPage1.map((collection) => {
+            expect(flatNodeList.find((flatnode) => (flatnode.id === collection.id))).toBeTruthy();
+          });
+        });
+      });
+      describe('Just first top comm expanded, all page 1: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
+        beforeEach(() => {
+          const communityFlatNode = toFlatNode(mockListOfTopCommunitiesPage1[0], observableOf(true), 0, true, null);
+          communityFlatNode.currentCollectionPage = 1;
+          communityFlatNode.currentCommunityPage = 1;
+          const expandedNodes = [communityFlatNode];
+          const sub = service.loadCommunities(expandedNodes)
+            .pipe(take(1)).subscribe((value) => flatNodeList = value);
+          sub.unsubscribe();
+        });
+        it('length of flatnode list should be as big as top community list and size of page-limited children of first top community', () => {
+          expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length + mockSubcommunities1Page1.length);
+        });
+        it('flatnode list should contain flatNode representations of all page-limited children of first top community', () => {
+          mockSubcommunities1Page1.map((subcommunity) => {
+            expect(flatNodeList.find((flatnode) => (flatnode.id === subcommunity.id))).toBeTruthy();
+          });
+        });
+      });
+      describe('Just second top comm expanded, collections at page 2: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
+        beforeEach(() => {
+          const communityFlatNode = toFlatNode(mockListOfTopCommunitiesPage1[1], observableOf(true), 0, true, null);
+          communityFlatNode.currentCollectionPage = 2;
+          communityFlatNode.currentCommunityPage = 1;
+          const expandedNodes = [communityFlatNode];
+          const sub = service.loadCommunities(expandedNodes)
+            .pipe(take(1)).subscribe((value) => flatNodeList = value);
+          sub.unsubscribe();
+        });
+        it('length of flatnode list should be as big as top community list and size of page-limited children of second top community', () => {
+          expect(flatNodeList.length).toEqual(mockListOfTopCommunitiesPage1.length + mockCollectionsPage1.length + mockCollectionsPage2.length);
+        });
+        it('flatnode list should contain flatNode representations of all page-limited children of first top community', () => {
+          mockCollectionsPage1.map((collection) => {
+            expect(flatNodeList.find((flatnode) => (flatnode.id === collection.id))).toBeTruthy();
+          });
+          mockCollectionsPage2.map((collection) => {
+            expect(flatNodeList.find((flatnode) => (flatnode.id === collection.id))).toBeTruthy();
+          });
+        });
+      });
+    });
+  });
+
+  describe('transformListOfCommunities', () => {
+    describe('should transform list of communities in a list of flatnodes with possible subcoms and collections as subflatnodes if they\'re expanded', () => {
+      describe('list of communities with possible children', () => {
+        const listOfCommunities = mockListOfTopCommunitiesPage1;
+        let flatNodeList;
+        describe('None expanded: should return list containing only flatnodes of the communities in the test list', () => {
+          beforeEach(() => {
+            const sub = service.transformListOfCommunities(new PaginatedList(new PageInfo(), listOfCommunities), 0, null, null)
+              .pipe(take(1)).subscribe((value) => flatNodeList = value);
+            sub.unsubscribe();
+          });
+          it('length of flatnode list should be as big as community test list', () => {
+            expect(flatNodeList.length).toEqual(listOfCommunities.length);
+          });
+          it('flatnode list should contain flatNode representations of all communities from test list', () => {
+            listOfCommunities.map((community) => {
+              expect(flatNodeList.find((flatnode) => (flatnode.id === community.id))).toBeTruthy();
+            });
+          });
+          it('none of the flatnodes in the list should be expanded', () => {
+            flatNodeList.map((flatnode: FlatNode) => {
+              expect(flatnode.isExpanded).toEqual(false);
+            });
+          });
+        });
+        describe('All top expanded, all page 1: should return list containing flatnodes of the communities in the test list and all its possible page-limited children (subcommunities and collections)', () => {
+          beforeEach(() => {
+            const expandedNodes = [];
+            listOfCommunities.map((community: Community) => {
+              const communityFlatNode = toFlatNode(community, observableOf(true), 0, true, null);
+              communityFlatNode.currentCollectionPage = 1;
+              communityFlatNode.currentCommunityPage = 1;
+              expandedNodes.push(communityFlatNode);
+            });
+            const sub = service.transformListOfCommunities(new PaginatedList(new PageInfo(), listOfCommunities), 0, null, expandedNodes)
+              .pipe(take(1)).subscribe((value) => flatNodeList = value);
+            sub.unsubscribe();
+          });
+          it('length of flatnode list should be as big as community test list and size of its possible children', () => {
+            expect(flatNodeList.length).toEqual(listOfCommunities.length + mockSubcommunities1Page1.length + mockSubcommunities1Page1.length);
+          });
+          it('flatnode list should contain flatNode representations of all children', () => {
+            mockSubcommunities1Page1.map((subcommunity) => {
+              expect(flatNodeList.find((flatnode) => (flatnode.id === subcommunity.id))).toBeTruthy();
+            });
+            mockSubcommunities1Page1.map((collection) => {
+              expect(flatNodeList.find((flatnode) => (flatnode.id === collection.id))).toBeTruthy();
+            });
+          });
+        });
+      });
+    });
+
+  });
+
+  describe('transformCommunity', () => {
+    describe('should transform community in list of flatnodes with possible subcoms and collections as subflatnodes if its expanded', () => {
+      describe('topcommunity without subcoms or collections, unexpanded', () => {
+        const communityWithNoSubcomsOrColls = Object.assign(new Community(), {
+          id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+          uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+          subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          metadata: {
+            'dc.description': [{ language: 'en_US', value: 'no subcoms, 2 coll' }],
+            'dc.title': [{ language: 'en_US', value: 'Community 2' }]
+          }
+        });
+        let flatNodeList;
+        describe('should return list containing only flatnode corresponding to that community', () => {
+          beforeEach(() => {
+            const sub = service.transformCommunity(communityWithNoSubcomsOrColls, 0, null, null)
+              .pipe(take(1)).subscribe((value) => flatNodeList = value);
+            sub.unsubscribe();
+          });
+          it('length of flatnode list should be 1', () => {
+            expect(flatNodeList.length).toEqual(1);
+          });
+          it('flatnode list only element should be flatNode of test community', () => {
+            expect(flatNodeList[0].id).toEqual(communityWithNoSubcomsOrColls.id);
+          });
+          it('flatnode from test community is not expanded', () => {
+            expect(flatNodeList[0].isExpanded).toEqual(false);
+          });
+        });
+      });
+      describe('topcommunity with subcoms or collections, unexpanded', () => {
+        const communityWithSubcoms = Object.assign(new Community(), {
+          id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+          uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+          subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+          collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          metadata: {
+            'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
+            'dc.title': [{ language: 'en_US', value: 'Community 1' }]
+          }
+        });
+        let flatNodeList;
+        describe('should return list containing only flatnode corresponding to that community', () => {
+          beforeAll(() => {
+            const sub = service.transformCommunity(communityWithSubcoms, 0, null, null)
+              .pipe(take(1)).subscribe((value) => flatNodeList = value);
+            sub.unsubscribe();
+          });
+          it('length of flatnode list should be 1', () => {
+            expect(flatNodeList.length).toEqual(1);
+          });
+          it('flatnode list only element should be flatNode of test community', () => {
+            expect(flatNodeList[0].id).toEqual(communityWithSubcoms.id);
+          });
+          it('flatnode from test community is not expanded', () => {
+            expect(flatNodeList[0].isExpanded).toEqual(false);
+          });
+        });
+      });
+      describe('topcommunity with subcoms, expanded, first page for all', () => {
+        describe('should return list containing flatnodes of that community, its possible subcommunities and its possible collections', () => {
+          const communityWithSubcoms = Object.assign(new Community(), {
+            id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+            uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+            subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+            collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+            metadata: {
+              'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
+              'dc.title': [{ language: 'en_US', value: 'Community 1' }]
+            }
+          });
+          let flatNodeList;
+          beforeEach(() => {
+            const communityFlatNode = toFlatNode(communityWithSubcoms, observableOf(true), 0, true, null);
+            communityFlatNode.currentCollectionPage = 1;
+            communityFlatNode.currentCommunityPage = 1;
+            const expandedNodes = [communityFlatNode];
+            const sub = service.transformCommunity(communityWithSubcoms, 0, null, expandedNodes)
+              .pipe(take(1)).subscribe((value) => flatNodeList = value);
+            sub.unsubscribe();
+          });
+          it('list of flatnodes is length is  1 + nrOfSubcoms & first flatnode is of expanded test community', () => {
+            expect(flatNodeList.length).toEqual(1 + mockSubcommunities1Page1.length);
+            expect(flatNodeList[0].isExpanded).toEqual(true);
+            expect(flatNodeList[0].id).toEqual(communityWithSubcoms.id);
+          });
+          it('list of flatnodes contains flatnodes for all subcoms of test community', () => {
+            mockSubcommunities1Page1.map((subcommunity) => {
+              expect(flatNodeList.find((flatnode) => (flatnode.id === subcommunity.id))).toBeTruthy();
+            });
+          });
+          it('the subcoms of the test community are a level higher than the parent community', () => {
+            mockSubcommunities1Page1.map((subcommunity) => {
+              expect((flatNodeList.find((flatnode) => (flatnode.id === subcommunity.id))).level).toEqual(flatNodeList[0].level + 1);
+            });
+          });
+        });
+      });
+      describe('topcommunity with collections, expanded, on second page of collections', () => {
+        describe('should return list containing flatnodes of that community, its collections of the first two pages', () => {
+          const communityWithCollections = Object.assign(new Community(), {
+            id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+            uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+            subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+            collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
+            metadata: {
+              'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
+              'dc.title': [{ language: 'en_US', value: 'Community 1' }]
+            }
+          });
+          let flatNodeList;
+          beforeEach(() => {
+            const communityFlatNode = toFlatNode(communityWithCollections, observableOf(true), 0, true, null);
+            communityFlatNode.currentCollectionPage = 2;
+            communityFlatNode.currentCommunityPage = 1;
+            const expandedNodes = [communityFlatNode];
+            const sub = service.transformCommunity(communityWithCollections, 0, null, expandedNodes)
+              .pipe(take(1)).subscribe((value) => flatNodeList = value);
+            sub.unsubscribe();
+          });
+          it('list of flatnodes is length is  1 + nrOfCollections & first flatnode is of expanded test community', () => {
+            expect(flatNodeList.length).toEqual(1 + mockCollectionsPage1.length + mockCollectionsPage2.length);
+            expect(flatNodeList[0].isExpanded).toEqual(true);
+            expect(flatNodeList[0].id).toEqual(communityWithCollections.id);
+          });
+          it('list of flatnodes contains flatnodes for all subcolls (first 2 pages) of test community', () => {
+            mockCollectionsPage1.map((collection) => {
+              expect(flatNodeList.find((flatnode) => (flatnode.id === collection.id))).toBeTruthy();
+            });
+            mockCollectionsPage2.map((collection) => {
+              expect(flatNodeList.find((flatnode) => (flatnode.id === collection.id))).toBeTruthy();
+            })
+          });
+          it('the collections of the test community are a level higher than the parent community', () => {
+            mockCollectionsPage1.map((collection) => {
+              expect((flatNodeList.find((flatnode) => (flatnode.id === collection.id))).level).toEqual(flatNodeList[0].level + 1);
+            });
+            mockCollectionsPage2.map((collection) => {
+              expect((flatNodeList.find((flatnode) => (flatnode.id === collection.id))).level).toEqual(flatNodeList[0].level + 1);
+            })
+          });
+        });
+      });
+    });
+
+  });
+
+  describe('getIsExpandable', () => {
+    describe('should return true', () => {
+      it('if community has subcommunities', () => {
+        const communityWithSubcoms = Object.assign(new Community(), {
+          id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+          uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+          subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+          collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          metadata: {
+            'dc.description': [{ language: 'en_US', value: '2 subcoms, no coll' }],
+            'dc.title': [{ language: 'en_US', value: 'Community 1' }]
+          }
+        });
+        service.getIsExpandable(communityWithSubcoms).pipe(take(1)).subscribe((result) => {
+          expect(result).toEqual(true);
+        });
+      });
+      it('if community has collections', () => {
+        const communityWithCollections = Object.assign(new Community(), {
+          id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+          uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+          subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockCollectionsPage1)),
+          metadata: {
+            'dc.description': [{ language: 'en_US', value: 'no subcoms, 2 coll' }],
+            'dc.title': [{ language: 'en_US', value: 'Community 2' }]
+          }
+        });
+        service.getIsExpandable(communityWithCollections).pipe(take(1)).subscribe((result) => {
+          expect(result).toEqual(true);
+        });
+      });
+    });
+    describe('should return false', () => {
+      it('if community has neither subcommunities nor collections', () => {
+        const communityWithNoSubcomsOrColls = Object.assign(new Community(), {
+          id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+          uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+          subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+          metadata: {
+            'dc.description': [{ language: 'en_US', value: 'no subcoms, no coll' }],
+            '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
new file mode 100644
index 0000000000..be04887e71
--- /dev/null
+++ b/src/app/community-list-page/community-list-service.ts
@@ -0,0 +1,335 @@
+import { Injectable } from '@angular/core';
+import { createSelector, Store } from '@ngrx/store';
+import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest';
+import { Observable, of as observableOf } from 'rxjs';
+import { AppState } from '../app.reducer';
+import { CommunityDataService } from '../core/data/community-data.service';
+import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
+import { catchError, filter, map, switchMap, take } from 'rxjs/operators';
+import { Community } from '../core/shared/community.model';
+import { Collection } from '../core/shared/collection.model';
+import { hasValue, isNotEmpty } from '../shared/empty.util';
+import { RemoteData } from '../core/data/remote-data';
+import { PaginatedList } from '../core/data/paginated-list';
+import { getCommunityPageRoute } from '../+community-page/community-page-routing.module';
+import { getCollectionPageRoute } from '../+collection-page/collection-page-routing.module';
+import { CollectionDataService } from '../core/data/collection-data.service';
+import { CommunityListSaveAction } from './community-list.actions';
+import { CommunityListState } from './community-list.reducer';
+
+/**
+ * Each node in the tree is represented by a flatNode which contains info about the node itself and its position and
+ *  state in the tree. There are nodes representing communities, collections and show more links.
+ */
+export interface FlatNode {
+  isExpandable$: Observable<boolean>;
+  name: string;
+  id: string;
+  level: number;
+  isExpanded?: boolean;
+  parent?: FlatNode;
+  payload: Community | Collection | ShowMoreFlatNode;
+  isShowMoreNode: boolean;
+  route?: string;
+  currentCommunityPage?: number;
+  currentCollectionPage?: number;
+}
+
+/**
+ * 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)
+ */
+export class ShowMoreFlatNode {
+}
+
+// Helper method to combine an flatten an array of observables of flatNode arrays
+export const combineAndFlatten = (obsList: Array<Observable<FlatNode[]>>): Observable<FlatNode[]> =>
+  observableCombineLatest(...obsList).pipe(
+    map((matrix: FlatNode[][]) =>
+      matrix.reduce((combinedList, currentList: FlatNode[]) => [...combinedList, ...currentList]))
+  );
+
+/**
+ * Creates a flatNode from a community or collection
+ * @param c               The community or collection this flatNode represents
+ * @param isExpandable    Whether or not this node is expandable (true if it has children)
+ * @param level           Level indicating how deep in the tree this node should be rendered
+ * @param isExpanded      Whether or not this node already is expanded
+ * @param parent          Parent of this node (flatNode representing its parent community)
+ */
+export const toFlatNode = (
+  c: Community | Collection,
+  isExpandable: Observable<boolean>,
+  level: number,
+  isExpanded: boolean,
+  parent?: FlatNode
+): FlatNode => ({
+  isExpandable$: isExpandable,
+  name: c.name,
+  id: c.id,
+  level: level,
+  isExpanded,
+  parent,
+  payload: c,
+  isShowMoreNode: false,
+  route: c instanceof Community ? getCommunityPageRoute(c.id) : getCollectionPageRoute(c.id),
+});
+
+/**
+ * Creates a show More flatnode where only the level and parent are of importance
+ */
+export const showMoreFlatNode = (
+  id: string,
+  level: number,
+  parent: FlatNode
+): FlatNode => ({
+  isExpandable$: observableOf(false),
+  name: 'Show More Flatnode',
+  id: id,
+  level: level,
+  isExpanded: false,
+  parent: parent,
+  payload: new ShowMoreFlatNode(),
+  isShowMoreNode: true,
+});
+
+// Selectors the get the communityList data out of the store
+const communityListStateSelector = (state: AppState) => state.communityList;
+const expandedNodesSelector = createSelector(communityListStateSelector, (communityList: CommunityListState) => communityList.expandedNodes);
+const loadingNodeSelector = createSelector(communityListStateSelector, (communityList: CommunityListState) => communityList.loadingNode);
+
+/**
+ * Service class for the community list, responsible for the creating of the flat list used by communityList dataSource
+ *  and connection to the store to retrieve and save the state of the community list
+ */
+// tslint:disable-next-line:max-classes-per-file
+@Injectable()
+export class CommunityListService {
+
+  // page-limited list of top-level communities
+  payloads$: Array<Observable<PaginatedList<Community>>>;
+
+  topCommunitiesConfig: PaginationComponentOptions;
+  topCommunitiesSortConfig: SortOptions;
+
+  maxSubCommunitiesPerPage: number;
+  maxCollectionsPerPage: number;
+
+  constructor(private communityDataService: CommunityDataService, private collectionDataService: CollectionDataService,
+              private store: Store<any>) {
+    this.topCommunitiesConfig = new PaginationComponentOptions();
+    this.topCommunitiesConfig.id = 'top-level-pagination';
+    this.topCommunitiesConfig.pageSize = 10;
+    this.topCommunitiesConfig.currentPage = 1;
+    this.topCommunitiesSortConfig = new SortOptions('dc.title', SortDirection.ASC);
+    this.initTopCommunityList();
+
+    this.maxSubCommunitiesPerPage = 3;
+    this.maxCollectionsPerPage = 3;
+  }
+
+  saveCommunityListStateToStore(expandedNodes: FlatNode[], loadingNode: FlatNode): void {
+    this.store.dispatch(new CommunityListSaveAction(expandedNodes, loadingNode));
+  }
+
+  getExpandedNodesFromStore(): Observable<FlatNode[]> {
+    return this.store.select(expandedNodesSelector);
+  }
+
+  getLoadingNodeFromStore(): Observable<FlatNode> {
+    return this.store.select(loadingNodeSelector);
+  }
+
+  /**
+   * Increases the payload so it contains the next page of top level communities
+   */
+  getNextPageTopCommunities(): void {
+    this.topCommunitiesConfig.currentPage = this.topCommunitiesConfig.currentPage + 1;
+    this.payloads$ = [...this.payloads$, this.communityDataService.findTop({
+      currentPage: this.topCommunitiesConfig.currentPage,
+      elementsPerPage: this.topCommunitiesConfig.pageSize,
+      sort: {
+        field: this.topCommunitiesSortConfig.field,
+        direction: this.topCommunitiesSortConfig.direction
+      }
+    }).pipe(
+      take(1),
+      map((results) => results.payload),
+    )];
+  }
+
+  /**
+   * Gets all top communities, limited by page, and transforms this in a list of flatNodes.
+   * @param expandedNodes     List of expanded nodes; if a node is not expanded its subCommunities and collections need
+   *                            not be added to the list
+   */
+  loadCommunities(expandedNodes: FlatNode[]): Observable<FlatNode[]> {
+    const res = this.payloads$.map((payload) => {
+      return payload.pipe(
+        take(1),
+        switchMap((result: PaginatedList<Community>) => {
+          return this.transformListOfCommunities(result, 0, null, expandedNodes);
+        }),
+        catchError(() => observableOf([])),
+      );
+    });
+    return combineAndFlatten(res);
+  };
+
+  /**
+   * Puts the initial top level communities in a list to be called upon
+   */
+  private initTopCommunityList(): void {
+    this.payloads$ = [this.communityDataService.findTop({
+      currentPage: this.topCommunitiesConfig.currentPage,
+      elementsPerPage: this.topCommunitiesConfig.pageSize,
+      sort: {
+        field: this.topCommunitiesSortConfig.field,
+        direction: this.topCommunitiesSortConfig.direction
+      }
+    }).pipe(
+      take(1),
+      map((results) => results.payload),
+    )];
+  }
+
+  /**
+   * Transforms a list of communities to a list of FlatNodes according to the instructions detailed in transformCommunity
+   * @param listOfPaginatedCommunities    Paginated list of communities to be transformed
+   * @param level                         Level the tree is currently at
+   * @param parent                        FlatNode of the parent of this list of communities
+   * @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[]> {
+    if (isNotEmpty(listOfPaginatedCommunities.page)) {
+      let currentPage = this.topCommunitiesConfig.currentPage;
+      if (isNotEmpty(parent)) {
+        currentPage = expandedNodes.find((node: FlatNode) => node.id === parent.id).currentCommunityPage;
+      }
+      const isNotAllCommunities = (listOfPaginatedCommunities.totalElements > (listOfPaginatedCommunities.elementsPerPage * currentPage));
+      let obsList = listOfPaginatedCommunities.page
+        .map((community: Community) => {
+          return this.transformCommunity(community, level, parent, expandedNodes)
+        });
+      if (isNotAllCommunities && listOfPaginatedCommunities.currentPage > currentPage) {
+        obsList = [...obsList, observableOf([showMoreFlatNode('community', level, parent)])];
+      }
+
+      return combineAndFlatten(obsList);
+    } else {
+      return observableOf([]);
+    }
+  }
+
+  /**
+   * 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.
+   * @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
+   * @param expandedNodes     List of nodes which are expanded, if node is not expanded, it need not add its page-limited subcommunities or collections
+   */
+  public transformCommunity(community: Community, level: number, parent: FlatNode, expandedNodes: FlatNode[]): Observable<FlatNode[]> {
+    let isExpanded = false;
+    if (isNotEmpty(expandedNodes)) {
+      isExpanded = hasValue(expandedNodes.find((node) => (node.id === community.id)));
+    }
+
+    const isExpandable$ = this.getIsExpandable(community);
+
+    const communityFlatNode = toFlatNode(community, isExpandable$, level, isExpanded, parent);
+
+    let obsList = [observableOf([communityFlatNode])];
+
+    if (isExpanded) {
+      const currentCommunityPage = expandedNodes.find((node: FlatNode) => node.id === community.id).currentCommunityPage;
+      let subcoms = [];
+      for (let i = 1; i <= currentCommunityPage; i++) {
+        const nextSetOfSubcommunitiesPage = this.communityDataService.findByParent(community.uuid, {
+          elementsPerPage: this.maxSubCommunitiesPerPage,
+          currentPage: i
+        })
+          .pipe(
+            filter((rd: RemoteData<PaginatedList<Community>>) => rd.hasSucceeded),
+            take(1),
+            switchMap((rd: RemoteData<PaginatedList<Community>>) =>
+              this.transformListOfCommunities(rd.payload, level + 1, communityFlatNode, expandedNodes))
+          );
+
+        subcoms = [...subcoms, nextSetOfSubcommunitiesPage];
+      }
+
+      obsList = [...obsList, combineAndFlatten(subcoms)];
+
+      const currentCollectionPage = expandedNodes.find((node: FlatNode) => node.id === community.id).currentCollectionPage;
+      let collections = [];
+      for (let i = 1; i <= currentCollectionPage; i++) {
+        const nextSetOfCollectionsPage = this.collectionDataService.findByParent(community.uuid, {
+          elementsPerPage: this.maxCollectionsPerPage,
+          currentPage: i
+        })
+          .pipe(
+            filter((rd: RemoteData<PaginatedList<Collection>>) => rd.hasSucceeded),
+            take(1),
+            map((rd: RemoteData<PaginatedList<Collection>>) => {
+              let nodes = rd.payload.page
+                .map((collection: Collection) => toFlatNode(collection, observableOf(false), level + 1, false, communityFlatNode));
+              if ((rd.payload.elementsPerPage * currentCollectionPage) < rd.payload.totalElements && rd.payload.currentPage > currentCollectionPage) {
+                nodes = [...nodes, showMoreFlatNode('collection', level + 1, communityFlatNode)];
+              }
+              return nodes;
+            }),
+          );
+        collections = [...collections, nextSetOfCollectionsPage];
+      }
+      obsList = [...obsList, combineAndFlatten(collections)];
+    }
+
+    return combineAndFlatten(obsList);
+  }
+
+  /**
+   * 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
+   *          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, { elementsPerPage: 1 })
+      .pipe(
+        filter((rd: RemoteData<PaginatedList<Community>>) => rd.hasSucceeded),
+        take(1),
+        map((results) => results.payload.totalElements > 0),
+      );
+
+    hasColls$ = this.collectionDataService.findByParent(community.uuid, { elementsPerPage: 1 })
+      .pipe(
+        filter((rd: RemoteData<PaginatedList<Collection>>) => rd.hasSucceeded),
+        take(1),
+        map((results) => results.payload.totalElements > 0),
+      );
+
+    let hasChildren$: Observable<boolean>;
+    hasChildren$ = observableCombineLatest(hasSubcoms$, hasColls$).pipe(
+      take(1),
+      map(([hasSubcoms, hasColls]: [boolean, boolean]) => {
+        if (hasSubcoms || hasColls) {
+          return true;
+        } else {
+          return false;
+        }
+      })
+    );
+
+    return hasChildren$;
+  }
+
+}
diff --git a/src/app/community-list-page/community-list.actions.ts b/src/app/community-list-page/community-list.actions.ts
new file mode 100644
index 0000000000..bfce6fba34
--- /dev/null
+++ b/src/app/community-list-page/community-list.actions.ts
@@ -0,0 +1,35 @@
+import { Action } from '@ngrx/store';
+import { type } from '../shared/ngrx/type';
+import { FlatNode } from './community-list-service';
+
+/**
+ * All the action types of the community-list
+ */
+
+export const CommunityListActionTypes = {
+  SAVE: type('dspace/community-list-page/SAVE')
+};
+
+/**
+ * Community list SAVE action
+ */
+export class CommunityListSaveAction implements Action {
+
+  type = CommunityListActionTypes.SAVE;
+
+  payload: {
+    expandedNodes: FlatNode[];
+    loadingNode: FlatNode;
+  };
+
+  constructor(expandedNodes: FlatNode[], loadingNode: FlatNode) {
+    this.payload = { expandedNodes, loadingNode }
+  }
+};
+
+/**
+ * Export a type alias of all actions in this action group
+ * so that reducers can easily compose action types
+ */
+
+export type CommunityListActions = CommunityListSaveAction;
diff --git a/src/app/community-list-page/community-list.reducer.spec.ts b/src/app/community-list-page/community-list.reducer.spec.ts
new file mode 100644
index 0000000000..63eaaccc03
--- /dev/null
+++ b/src/app/community-list-page/community-list.reducer.spec.ts
@@ -0,0 +1,45 @@
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import { PaginatedList } from '../core/data/paginated-list';
+import { Community } from '../core/shared/community.model';
+import { PageInfo } from '../core/shared/page-info.model';
+import { createSuccessfulRemoteDataObject$ } from '../shared/testing/utils';
+import { toFlatNode } from './community-list-service';
+import { CommunityListSaveAction } from './community-list.actions';
+import { CommunityListReducer } from './community-list.reducer';
+
+describe('communityListReducer', () => {
+  const mockSubcommunities1Page1 = [Object.assign(new Community(), {
+    id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+    uuid: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+    name: 'subcommunity1',
+  })];
+  const mockFlatNodeOfCommunity = toFlatNode(
+    Object.assign(new Community(), {
+      id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+      uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+      subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+      collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+      name: 'community1',
+    }), observableOf(true), 0, false, null
+  );
+
+  it ('should set init state of the expandedNodes and loadingNode', () => {
+    const state = {
+      expandedNodes: [],
+      loadingNode: null,
+    };
+    const action = new CommunityListSaveAction([], null);
+    const newState = CommunityListReducer(null, action);
+    expect(newState).toEqual(state);
+  });
+
+  it ('should save new state of the expandedNodes and loadingNode at a save action', () => {
+    const state = {
+      expandedNodes: [mockFlatNodeOfCommunity],
+      loadingNode: null,
+    };
+    const action = new CommunityListSaveAction([mockFlatNodeOfCommunity], null);
+    const newState = CommunityListReducer(null, action);
+    expect(newState).toEqual(state);
+  });
+});
diff --git a/src/app/community-list-page/community-list.reducer.ts b/src/app/community-list-page/community-list.reducer.ts
new file mode 100644
index 0000000000..b455fc496a
--- /dev/null
+++ b/src/app/community-list-page/community-list.reducer.ts
@@ -0,0 +1,36 @@
+import { FlatNode } from './community-list-service';
+import { CommunityListActions, CommunityListActionTypes, CommunityListSaveAction } from './community-list.actions';
+
+/**
+ * States we wish to put in store concerning the community list
+ */
+export interface CommunityListState {
+  expandedNodes: FlatNode[];
+  loadingNode: FlatNode;
+}
+
+/**
+ * Initial starting state of the list of expandedNodes and the current loading node of the community list
+ */
+const initialState: CommunityListState = {
+  expandedNodes: [],
+  loadingNode: null,
+};
+
+/**
+ * Reducer to interact with store concerning objects for the community list
+ * @constructor
+ */
+export function CommunityListReducer(state = initialState, action: CommunityListActions) {
+  switch (action.type) {
+    case CommunityListActionTypes.SAVE: {
+      return Object.assign({}, state, {
+        expandedNodes: (action as CommunityListSaveAction).payload.expandedNodes,
+        loadingNode: (action as CommunityListSaveAction).payload.loadingNode,
+      })
+    }
+    default: {
+      return state;
+    }
+  }
+}
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
new file mode 100644
index 0000000000..c179715bf1
--- /dev/null
+++ b/src/app/community-list-page/community-list/community-list.component.html
@@ -0,0 +1,91 @@
+<ds-loading *ngIf="(dataSource.loading$ | async) && loadingNode === undefined " class="ds-loading"></ds-loading>
+
+<cdk-tree [dataSource]="dataSource" [treeControl]="treeControl">
+  <!-- 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>
+      <div class="align-middle pt-2">
+        <a *ngIf="node!==loadingNode" [routerLink]="" (click)="getNextPage(node)"
+           class="btn btn-outline-secondary btn-sm">
+          {{ 'communityList.showMore' | translate }}
+        </a>
+        <ds-loading *ngIf="node===loadingNode && dataSource.loading$ | async" class="ds-loading"></ds-loading>
+      </div>
+    </div>
+    <div class="text-muted" cdkTreeNodePadding>
+      <div class="d-flex">
+      </div>
+    </div>
+  </cdk-tree-node>
+  <!-- This is the tree node template for expandable nodes (coms and subcoms with children) -->
+  <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
+              [attr.aria-label]="'toggle ' + node.name"
+              (click)="toggleExpanded(node)"
+              [ngClass]="(node.isExpandable$ | async) ? 'visible' : 'invisible'">
+        <span class="{{node.isExpanded ? 'fa fa-chevron-down' : 'fa fa-chevron-right'}}"
+              aria-hidden="true"></span>
+      </button>
+      <h5 class="align-middle pt-2">
+        <a [routerLink]="node.route" class="lead">
+          {{node.name}}
+        </a>
+      </h5>
+    </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>
+          <ds-truncatable-part [id]="node.id" [minLines]="3">
+            <span>{{node.payload.shortDescription}}</span>
+          </ds-truncatable-part>
+        </div>
+      </div>
+    </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>
+      <ds-loading class="ds-loading"></ds-loading>
+    </div>
+  </cdk-tree-node>
+  <!-- This is the tree node template for leaf nodes (collections and (sub)coms without children) -->
+  <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>
+      <h6 class="align-middle pt-2">
+        <a [routerLink]="node.route" class="lead">
+          {{node.name}}
+        </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>
+          <ds-truncatable-part [id]="node.id" [minLines]="3">
+            <span>{{node.payload.shortDescription}}</span>
+          </ds-truncatable-part>
+        </div>
+      </div>
+    </ds-truncatable>
+  </cdk-tree-node>
+</cdk-tree>
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
new file mode 100644
index 0000000000..c04aadda37
--- /dev/null
+++ b/src/app/community-list-page/community-list/community-list.component.spec.ts
@@ -0,0 +1,336 @@
+import { async, ComponentFixture, fakeAsync, inject, TestBed, tick } from '@angular/core/testing';
+
+import { CommunityListComponent } from './community-list.component';
+import {
+  CommunityListService,
+  FlatNode,
+  showMoreFlatNode,
+  toFlatNode
+} from '../community-list-service';
+import { CdkTreeModule } from '@angular/cdk/tree';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { MockTranslateLoader } from '../../shared/mocks/mock-translate-loader';
+import { CUSTOM_ELEMENTS_SCHEMA } from '@angular/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { Community } from '../../core/shared/community.model';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { PaginatedList } from '../../core/data/paginated-list';
+import { PageInfo } from '../../core/shared/page-info.model';
+import { Collection } from '../../core/shared/collection.model';
+import { of as observableOf } from 'rxjs';
+import { By } from '@angular/platform-browser';
+import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+
+describe('CommunityListComponent', () => {
+  let component: CommunityListComponent;
+  let fixture: ComponentFixture<CommunityListComponent>;
+
+  const mockSubcommunities1Page1 = [Object.assign(new Community(), {
+    id: 'ce64f48e-2c9b-411a-ac36-ee429c0e6a88',
+    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',
+    })
+  ];
+  const mockCollectionsPage1 = [
+    Object.assign(new Collection(), {
+      id: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+      uuid: 'e9dbf393-7127-415f-8919-55be34a6e9ed',
+      name: 'collection1',
+    }),
+    Object.assign(new Collection(), {
+      id: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
+      uuid: '59da2ff0-9bf4-45bf-88be-e35abd33f304',
+      name: 'collection2',
+    })
+  ];
+  const mockCollectionsPage2 = [
+    Object.assign(new Collection(), {
+      id: 'a5159760-f362-4659-9e81-e3253ad91ede',
+      uuid: 'a5159760-f362-4659-9e81-e3253ad91ede',
+      name: 'collection3',
+    }),
+    Object.assign(new Collection(), {
+      id: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
+      uuid: 'a392e16b-fcf2-400a-9a88-53ef7ecbdcd3',
+      name: 'collection4',
+    })
+  ];
+
+  const mockTopCommunitiesWithChildrenArrays = [
+    {
+      id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+      uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+      subcommunities: mockSubcommunities1Page1,
+      collections: [],
+    },
+    {
+      id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+      uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+      subcommunities: [],
+      collections: [...mockCollectionsPage1, ...mockCollectionsPage2],
+    },
+    {
+      id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+      uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+      subcommunities: [],
+      collections: [],
+    }];
+
+  const mockTopFlatnodesUnexpanded: FlatNode[] = [
+    toFlatNode(
+      Object.assign(new Community(), {
+        id: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+        uuid: '7669c72a-3f2a-451f-a3b9-9210e7a4c02f',
+        subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), mockSubcommunities1Page1)),
+        collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+        name: 'community1',
+      }), observableOf(true), 0, false, null
+    ),
+    toFlatNode(
+      Object.assign(new Community(), {
+        id: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+        uuid: '9076bd16-e69a-48d6-9e41-0238cb40d863',
+        subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+        collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [...mockCollectionsPage1, ...mockCollectionsPage2])),
+        name: 'community2',
+      }), observableOf(true), 0, false, null
+    ),
+    toFlatNode(
+      Object.assign(new Community(), {
+        id: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+        uuid: 'efbf25e1-2d8c-4c28-8f3e-2e04c215be24',
+        subcommunities: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+        collections: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo(), [])),
+        name: 'community3',
+      }), observableOf(false), 0, false, null
+    ),
+  ];
+  let communityListServiceStub;
+
+  beforeEach(async(() => {
+    communityListServiceStub = {
+      topPageSize: 2,
+      topCurrentPage: 1,
+      collectionPageSize: 2,
+      subcommunityPageSize: 2,
+      expandedNodes: [],
+      loadingNode: null,
+      getNextPageTopCommunities() {
+        this.topCurrentPage++;
+      },
+      getLoadingNodeFromStore() {
+        return observableOf(this.loadingNode);
+      },
+      getExpandedNodesFromStore() {
+        return observableOf(this.expandedNodes);
+      },
+      saveCommunityListStateToStore(expandedNodes, loadingNode) {
+        this.expandedNodes = expandedNodes;
+        this.loadingNode = loadingNode;
+      },
+      loadCommunities(expandedNodes) {
+        let flatnodes;
+        let showMoreTopComNode = false;
+        flatnodes = [...mockTopFlatnodesUnexpanded];
+        const currentPage = this.topCurrentPage;
+        const elementsPerPage = this.topPageSize;
+        let endPageIndex = (currentPage * elementsPerPage);
+        if (endPageIndex >= flatnodes.length) {
+          endPageIndex = flatnodes.length;
+        } else {
+          showMoreTopComNode = true;
+        }
+        if (expandedNodes === null || isEmpty(expandedNodes)) {
+          if (showMoreTopComNode) {
+            return observableOf([...mockTopFlatnodesUnexpanded.slice(0, endPageIndex), showMoreFlatNode('community', 0, null)]);
+          } else {
+            return observableOf(mockTopFlatnodesUnexpanded.slice(0, endPageIndex));
+          }
+        } else {
+          flatnodes = [];
+          const topFlatnodes = mockTopFlatnodesUnexpanded.slice(0, endPageIndex);
+          topFlatnodes.map((topNode: FlatNode) => {
+            flatnodes = [...flatnodes, topNode];
+            const expandedParent: FlatNode = expandedNodes.find((expandedNode: FlatNode) => expandedNode.id === topNode.id);
+            if (isNotEmpty(expandedParent)) {
+              const matchingTopComWithArrays = mockTopCommunitiesWithChildrenArrays.find((topcom) => topcom.id === topNode.id);
+              if (isNotEmpty(matchingTopComWithArrays)) {
+                const possibleSubcoms: Community[] = matchingTopComWithArrays.subcommunities;
+                let subComFlatnodes = [];
+                possibleSubcoms.map((subcom: Community) => {
+                  subComFlatnodes = [...subComFlatnodes, toFlatNode(subcom, observableOf(false), topNode.level + 1, false, topNode)];
+                });
+                const possibleColls: Collection[] = matchingTopComWithArrays.collections;
+                let collFlatnodes = [];
+                possibleColls.map((coll: Collection) => {
+                  collFlatnodes = [...collFlatnodes, toFlatNode(coll, observableOf(false), topNode.level + 1, false, topNode)];
+                });
+                if (isNotEmpty(subComFlatnodes)) {
+                  const endSubComIndex = this.subcommunityPageSize * expandedParent.currentCommunityPage;
+                  flatnodes = [...flatnodes, ...subComFlatnodes.slice(0, endSubComIndex)];
+                  if (subComFlatnodes.length > endSubComIndex) {
+                    flatnodes = [...flatnodes, showMoreFlatNode('community', topNode.level + 1, expandedParent)];
+                  }
+                }
+                if (isNotEmpty(collFlatnodes)) {
+                  const endColIndex = this.collectionPageSize * expandedParent.currentCollectionPage;
+                  flatnodes = [...flatnodes, ...collFlatnodes.slice(0, endColIndex)];
+                  if (collFlatnodes.length > endColIndex) {
+                    flatnodes = [...flatnodes, showMoreFlatNode('collection', topNode.level + 1, expandedParent)];
+                  }
+                }
+              }
+            }
+          });
+          if (showMoreTopComNode) {
+            flatnodes = [...flatnodes, showMoreFlatNode('community', 0, null)];
+          }
+          return observableOf(flatnodes);
+        }
+      }
+    };
+    TestBed.configureTestingModule({
+      imports: [
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: MockTranslateLoader
+          },
+        }),
+        CdkTreeModule,
+        RouterTestingModule],
+      declarations: [CommunityListComponent],
+      providers: [CommunityListComponent,
+        { provide: CommunityListService, useValue: communityListServiceStub },],
+      schemas: [CUSTOM_ELEMENTS_SCHEMA],
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(CommunityListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', inject([CommunityListComponent], (comp: CommunityListComponent) => {
+    expect(comp).toBeTruthy();
+  }));
+
+  it('should render a cdk tree with the first elementsPerPage (2) nr of top level communities, unexpanded', () => {
+    const expandableNodesFound = fixture.debugElement.queryAll(By.css('.expandable-node a'));
+    const childlessNodesFound = fixture.debugElement.queryAll(By.css('.childless-node a'));
+    const allNodes = [...expandableNodesFound, ...childlessNodesFound];
+    expect(allNodes.length).toEqual(2);
+    mockTopFlatnodesUnexpanded.slice(0, 2).map((topFlatnode: FlatNode) => {
+      expect(allNodes.find((foundEl) => {
+        return (foundEl.nativeElement.textContent.trim() === topFlatnode.name);
+      })).toBeTruthy();
+    });
+  });
+
+  it('show more node is present at end of nodetree', () => {
+    const showMoreEl = fixture.debugElement.queryAll(By.css('.show-more-node'));
+    expect(showMoreEl.length).toEqual(1);
+    expect(showMoreEl).toBeTruthy();
+  });
+
+  describe('when show more of top communities is clicked', () => {
+    beforeEach(fakeAsync(() => {
+      const showMoreLink = fixture.debugElement.query(By.css('.show-more-node a'));
+      showMoreLink.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+      fixture.detectChanges();
+    }));
+    it('tree contains maximum of currentPage (2) * (2) elementsPerPage of first top communities, or less if there are less communities (3)', () => {
+      const expandableNodesFound = fixture.debugElement.queryAll(By.css('.expandable-node a'));
+      const childlessNodesFound = fixture.debugElement.queryAll(By.css('.childless-node a'));
+      const allNodes = [...expandableNodesFound, ...childlessNodesFound];
+      expect(allNodes.length).toEqual(3);
+      mockTopFlatnodesUnexpanded.map((topFlatnode: FlatNode) => {
+        expect(allNodes.find((foundEl) => {
+          return (foundEl.nativeElement.textContent.trim() === topFlatnode.name);
+        })).toBeTruthy();
+      });
+    });
+    it('show more node is gone from end of nodetree', () => {
+      const showMoreEl = fixture.debugElement.queryAll(By.css('.show-more-node'));
+      expect(showMoreEl.length).toEqual(0);
+    });
+  });
+
+  describe('when first expandable node is expanded', () => {
+    let allNodes;
+    beforeEach(fakeAsync(() => {
+      const chevronExpand = fixture.debugElement.query(By.css('.expandable-node button'));
+      const chevronExpandSpan = fixture.debugElement.query(By.css('.expandable-node button span'));
+      if (chevronExpandSpan.nativeElement.classList.contains('fa-chevron-right')) {
+        chevronExpand.nativeElement.click();
+        tick();
+        fixture.detectChanges();
+      }
+
+      const expandableNodesFound = fixture.debugElement.queryAll(By.css('.expandable-node a'));
+      const childlessNodesFound = fixture.debugElement.queryAll(By.css('.childless-node a'));
+      allNodes = [...expandableNodesFound, ...childlessNodesFound];
+    }));
+    describe('children of first expandable node are added to tree (page-limited)', () => {
+      it('tree contains page-limited topcoms (2) and children of first expandable node (2subcoms)', () => {
+        expect(allNodes.length).toEqual(4);
+        mockTopFlatnodesUnexpanded.slice(0, 2).map((topFlatnode: FlatNode) => {
+          expect(allNodes.find((foundEl) => {
+            return (foundEl.nativeElement.textContent.trim() === topFlatnode.name);
+          })).toBeTruthy();
+        });
+        mockSubcommunities1Page1.map((subcom) => {
+          expect(allNodes.find((foundEl) => {
+            return (foundEl.nativeElement.textContent.trim() === subcom.name);
+          })).toBeTruthy();
+        })
+      });
+    });
+  });
+
+  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;
+      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();
+          tick();
+          fixture.detectChanges();
+        }
+
+        const expandableNodesFound = fixture.debugElement.queryAll(By.css('.expandable-node a'));
+        const childlessNodesFound = fixture.debugElement.queryAll(By.css('.childless-node a'));
+        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();
+        });
+        expect(allNodes.length).toEqual(4);
+        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
new file mode 100644
index 0000000000..ddcd49cd1c
--- /dev/null
+++ b/src/app/community-list-page/community-list/community-list.component.ts
@@ -0,0 +1,104 @@
+import { Component, OnDestroy, OnInit } from '@angular/core';
+import { take } from 'rxjs/operators';
+import { CommunityListService, FlatNode } from '../community-list-service';
+import { CommunityListDatasource } from '../community-list-datasource';
+import { FlatTreeControl } from '@angular/cdk/tree';
+import { isEmpty } from '../../shared/empty.util';
+
+/**
+ * A tree-structured list of nodes representing the communities, their subCommunities and collections.
+ * Initially only the page-restricted top communities are shown.
+ * Each node can be expanded to show its children and all children are also page-limited.
+ * More pages of a page-limited result can be shown by pressing a show more node/link.
+ * Which nodes were expanded is kept in the store, so this persists across pages.
+ */
+@Component({
+  selector: 'ds-community-list',
+  templateUrl: './community-list.component.html',
+})
+export class CommunityListComponent implements OnInit, OnDestroy {
+
+  private expandedNodes: FlatNode[] = [];
+  public loadingNode: FlatNode;
+
+  treeControl = new FlatTreeControl<FlatNode>(
+    (node) => node.level, (node) => true
+  );
+
+  dataSource: CommunityListDatasource;
+
+  constructor(private communityListService: CommunityListService) {
+  }
+
+  ngOnInit() {
+    this.dataSource = new CommunityListDatasource(this.communityListService);
+    this.communityListService.getLoadingNodeFromStore().pipe(take(1)).subscribe((result) => {
+      this.loadingNode = result;
+    });
+    this.communityListService.getExpandedNodesFromStore().pipe(take(1)).subscribe((result) => {
+      this.expandedNodes = [...result];
+      this.dataSource.loadCommunities(this.expandedNodes);
+    });
+  }
+
+  ngOnDestroy(): void {
+    this.communityListService.saveCommunityListStateToStore(this.expandedNodes, this.loadingNode);
+  }
+
+  // whether or not this node has children (subcommunities or collections)
+  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
+  isShowMore(_: number, node: FlatNode) {
+    return node.isShowMoreNode;
+  }
+
+  /**
+   * Toggles the expanded variable of a node, adds it to the exapanded 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);
+      node.isExpanded = false;
+    } else {
+      this.expandedNodes.push(node);
+      node.isExpanded = true;
+      if (isEmpty(node.currentCollectionPage)) {
+        node.currentCollectionPage = 1;
+      }
+      if (isEmpty(node.currentCommunityPage)) {
+        node.currentCommunityPage = 1;
+      }
+    }
+    this.dataSource.loadCommunities(this.expandedNodes);
+  }
+
+  /**
+   * 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
+   */
+  getNextPage(node: FlatNode): void {
+    this.loadingNode = node;
+    if (node.parent != null) {
+      if (node.id === 'collection') {
+        const parentNodeInExpandedNodes = this.expandedNodes.find((node2: FlatNode) => node.parent.id === node2.id);
+        parentNodeInExpandedNodes.currentCollectionPage++;
+      }
+      if (node.id === 'community') {
+        const parentNodeInExpandedNodes = this.expandedNodes.find((node2: FlatNode) => node.parent.id === node2.id);
+        parentNodeInExpandedNodes.currentCommunityPage++;
+      }
+      this.dataSource.loadCommunities(this.expandedNodes);
+    } else {
+      this.communityListService.getNextPageTopCommunities();
+      this.dataSource.loadCommunities(this.expandedNodes);
+    }
+  }
+
+}
diff --git a/src/app/core/auth/auth.interceptor.ts b/src/app/core/auth/auth.interceptor.ts
index da760b8faa..08e892bbd9 100644
--- a/src/app/core/auth/auth.interceptor.ts
+++ b/src/app/core/auth/auth.interceptor.ts
@@ -56,7 +56,7 @@ export class AuthInterceptor implements HttpInterceptor {
     return http.url && http.url.endsWith('/authn/logout');
   }
 
-  private makeAuthStatusObject(authenticated:boolean, accessToken?: string, error?: string): AuthStatus {
+  private makeAuthStatusObject(authenticated: boolean, accessToken?: string, error?: string): AuthStatus {
     const authStatus = new AuthStatus();
     authStatus.id = null;
     authStatus.okay = true;
diff --git a/src/app/core/auth/auth.service.ts b/src/app/core/auth/auth.service.ts
index 94b1e9e6ff..a536313521 100644
--- a/src/app/core/auth/auth.service.ts
+++ b/src/app/core/auth/auth.service.ts
@@ -60,7 +60,8 @@ export class AuthService {
     // and is not the login route, clear redirect url and messages
     const routeUrl$ = this.store.pipe(
       select(routerStateSelector),
-      filter((routerState: RouterReducerState) => isNotUndefined(routerState) && isNotUndefined(routerState.state)),
+      filter((routerState: RouterReducerState) => isNotUndefined(routerState)
+        && isNotUndefined(routerState.state) && isNotEmpty(routerState.state.url)),
       filter((routerState: RouterReducerState) => !this.isLoginRoute(routerState.state.url)),
       map((routerState: RouterReducerState) => routerState.state.url)
     );
diff --git a/src/app/core/cache/builders/normalized-object-build.service.ts b/src/app/core/cache/builders/normalized-object-build.service.ts
index 936548cdd4..69d7454d2d 100644
--- a/src/app/core/cache/builders/normalized-object-build.service.ts
+++ b/src/app/core/cache/builders/normalized-object-build.service.ts
@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { NormalizedObject } from '../models/normalized-object.model';
 import { getMapsToType, getRelationships } from './build-decorators';
 import { hasValue, isNotEmpty } from '../../../shared/empty.util';
-import { TypedObject } from '../object-cache.reducer';
+import { CacheableObject, TypedObject } from '../object-cache.reducer';
 
 /**
  * Return true if halObj has a value for `_links.self`
@@ -34,14 +34,13 @@ export class NormalizedObjectBuildService {
    *
    * @param {TDomain} domainModel a domain model
    */
-  normalize<T extends TypedObject>(domainModel: T): NormalizedObject<T> {
+  normalize<T extends CacheableObject>(domainModel: T): NormalizedObject<T> {
     const normalizedConstructor = getMapsToType((domainModel as any).type);
     const relationships = getRelationships(normalizedConstructor) || [];
-
     const normalizedModel = Object.assign({}, domainModel) as any;
     relationships.forEach((key: string) => {
-      if (hasValue(domainModel[key])) {
-        domainModel[key] = undefined;
+      if (hasValue(normalizedModel[key])) {
+        normalizedModel[key] = normalizedModel._links[key];
       }
     });
     return normalizedModel;
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 a9fd699af2..48c5090102 100644
--- a/src/app/core/cache/builders/remote-data-build.service.ts
+++ b/src/app/core/cache/builders/remote-data-build.service.ts
@@ -116,7 +116,7 @@ export class RemoteDataBuildService {
     const requestEntry$ = href$.pipe(getRequestFromRequestHref(this.requestService));
     const tDomainList$ = requestEntry$.pipe(
       getResourceLinksFromResponse(),
-      flatMap((resourceUUIDs: string[]) => {
+      switchMap((resourceUUIDs: string[]) => {
         return this.objectCache.getList(resourceUUIDs).pipe(
           map((normList: Array<NormalizedObject<T>>) => {
             return normList.map((normalized: NormalizedObject<T>) => {
@@ -273,12 +273,14 @@ export class RemoteDataBuildService {
   private toPaginatedList<T>(input: Observable<RemoteData<T[] | PaginatedList<T>>>, pageInfo: PageInfo): Observable<RemoteData<PaginatedList<T>>> {
     return input.pipe(
       map((rd: RemoteData<T[] | PaginatedList<T>>) => {
+        const rdAny = rd as any;
+        const newRD = new RemoteData(rdAny.requestPending, rdAny.responsePending, rdAny.isSuccessful, rd.error, undefined);
         if (Array.isArray(rd.payload)) {
-          return Object.assign(rd, { payload: new PaginatedList(pageInfo, rd.payload) })
+          return Object.assign(newRD, { payload: new PaginatedList(pageInfo, rd.payload) })
         } else if (isNotUndefined(rd.payload)) {
-          return Object.assign(rd, { payload: new PaginatedList(pageInfo, rd.payload.page) });
+          return Object.assign(newRD, { payload: new PaginatedList(pageInfo, rd.payload.page) });
         } else {
-          return Object.assign(rd, { payload: new PaginatedList(pageInfo, []) });
+          return Object.assign(newRD, { payload: new PaginatedList(pageInfo, []) });
         }
       })
     );
diff --git a/src/app/core/cache/models/items/normalized-relationship.model.ts b/src/app/core/cache/models/items/normalized-relationship.model.ts
index 0930134b18..1c1dcf8d5b 100644
--- a/src/app/core/cache/models/items/normalized-relationship.model.ts
+++ b/src/app/core/cache/models/items/normalized-relationship.model.ts
@@ -1,4 +1,4 @@
-import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
+import { autoserialize, deserialize, deserializeAs, inheritSerialization } from 'cerialize';
 import { Relationship } from '../../../shared/item-relationships/relationship.model';
 import { mapsTo, relationship } from '../../builders/build-decorators';
 import { NormalizedObject } from '../normalized-object.model';
@@ -16,20 +16,20 @@ export class NormalizedRelationship extends NormalizedObject<Relationship> {
   /**
    * The identifier of this Relationship
    */
-  @autoserialize
+  @deserialize
   id: string;
 
   /**
    * The item to the left of this relationship
    */
-  @autoserialize
+  @deserialize
   @relationship(Item, false)
   leftItem: string;
 
   /**
    * The item to the right of this relationship
    */
-  @autoserialize
+  @deserialize
   @relationship(Item, false)
   rightItem: string;
 
@@ -46,15 +46,27 @@ export class NormalizedRelationship extends NormalizedObject<Relationship> {
   rightPlace: number;
 
   /**
-   * The type of Relationship
+   * The name variant of the Item to the left side of this Relationship
    */
   @autoserialize
+  leftwardValue: string;
+
+  /**
+   * The name variant of the Item to the right side of this Relationship
+   */
+  @autoserialize
+  rightwardValue: string;
+
+  /**
+   * The type of Relationship
+   */
+  @deserialize
   @relationship(RelationshipType, false)
   relationshipType: string;
 
   /**
    * The universally unique identifier of this Relationship
    */
-  @autoserializeAs(new IDToUUIDSerializer(Relationship.type.value), 'id')
+  @deserializeAs(new IDToUUIDSerializer(Relationship.type.value), 'id')
   uuid: string;
 }
diff --git a/src/app/core/cache/models/normalized-external-source-entry.model.ts b/src/app/core/cache/models/normalized-external-source-entry.model.ts
new file mode 100644
index 0000000000..e8e3c695c3
--- /dev/null
+++ b/src/app/core/cache/models/normalized-external-source-entry.model.ts
@@ -0,0 +1,36 @@
+import { autoserialize, autoserializeAs, inheritSerialization } from 'cerialize';
+import { NormalizedObject } from './normalized-object.model';
+import { ExternalSourceEntry } from '../../shared/external-source-entry.model';
+import { mapsTo } from '../builders/build-decorators';
+import { MetadataMap, MetadataMapSerializer } from '../../shared/metadata.models';
+
+/**
+ * Normalized model class for an external source entry
+ */
+@mapsTo(ExternalSourceEntry)
+@inheritSerialization(NormalizedObject)
+export class NormalizedExternalSourceEntry extends NormalizedObject<ExternalSourceEntry> {
+  /**
+   * Unique identifier
+   */
+  @autoserialize
+  id: string;
+
+  /**
+   * The value to display
+   */
+  @autoserialize
+  display: string;
+
+  /**
+   * The value to store the entry with
+   */
+  @autoserialize
+  value: string;
+
+  /**
+   * Metadata of the entry
+   */
+  @autoserializeAs(MetadataMapSerializer)
+  metadata: MetadataMap;
+}
diff --git a/src/app/core/cache/models/normalized-external-source.model.ts b/src/app/core/cache/models/normalized-external-source.model.ts
new file mode 100644
index 0000000000..fd9a42fb72
--- /dev/null
+++ b/src/app/core/cache/models/normalized-external-source.model.ts
@@ -0,0 +1,29 @@
+import { autoserialize, inheritSerialization } from 'cerialize';
+import { NormalizedObject } from './normalized-object.model';
+import { ExternalSource } from '../../shared/external-source.model';
+import { mapsTo } from '../builders/build-decorators';
+
+/**
+ * Normalized model class for an external source
+ */
+@mapsTo(ExternalSource)
+@inheritSerialization(NormalizedObject)
+export class NormalizedExternalSource extends NormalizedObject<ExternalSource> {
+  /**
+   * Unique identifier
+   */
+  @autoserialize
+  id: string;
+
+  /**
+   * The name of this external source
+   */
+  @autoserialize
+  name: string;
+
+  /**
+   * Is the source hierarchical?
+   */
+  @autoserialize
+  hierarchical: boolean;
+}
diff --git a/src/app/core/cache/models/normalized-item.model.ts b/src/app/core/cache/models/normalized-item.model.ts
index c613c59a0c..9b7edf70c0 100644
--- a/src/app/core/cache/models/normalized-item.model.ts
+++ b/src/app/core/cache/models/normalized-item.model.ts
@@ -65,7 +65,7 @@ export class NormalizedItem extends NormalizedDSpaceObject<Item> {
   @relationship(Bundle, true)
   bundles: string[];
 
-  @autoserialize
+  @deserialize
   @relationship(Relationship, true)
   relationships: string[];
 
diff --git a/src/app/core/cache/models/normalized-object.model.ts b/src/app/core/cache/models/normalized-object.model.ts
index bb5f192a7a..8a3aed32c9 100644
--- a/src/app/core/cache/models/normalized-object.model.ts
+++ b/src/app/core/cache/models/normalized-object.model.ts
@@ -1,5 +1,5 @@
 import { CacheableObject, TypedObject } from '../object-cache.reducer';
-import { autoserialize } from 'cerialize';
+import { autoserialize, deserialize } from 'cerialize';
 import { ResourceType } from '../../shared/resource-type';
 /**
  * An abstract model class for a NormalizedObject.
@@ -8,10 +8,10 @@ export abstract class NormalizedObject<T extends TypedObject> implements Cacheab
   /**
    * The link to the rest endpoint where this object can be found
    */
-  @autoserialize
+  @deserialize
   self: string;
 
-  @autoserialize
+  @deserialize
   _links: {
     [name: string]: string
   };
@@ -19,6 +19,6 @@ export abstract class NormalizedObject<T extends TypedObject> implements Cacheab
   /**
    * A string representing the kind of object
    */
-  @autoserialize
+  @deserialize
   type: string;
 }
diff --git a/src/app/core/cache/models/normalized-site.model.ts b/src/app/core/cache/models/normalized-site.model.ts
new file mode 100644
index 0000000000..68a7e0a480
--- /dev/null
+++ b/src/app/core/cache/models/normalized-site.model.ts
@@ -0,0 +1,13 @@
+import { inheritSerialization } from 'cerialize';
+import { NormalizedDSpaceObject } from './normalized-dspace-object.model';
+import { mapsTo } from '../builders/build-decorators';
+import { Site } from '../../shared/site.model';
+
+/**
+ * Normalized model class for a Site object
+ */
+@mapsTo(Site)
+@inheritSerialization(NormalizedDSpaceObject)
+export class NormalizedSite extends NormalizedDSpaceObject<Site> {
+
+}
diff --git a/src/app/core/cache/models/search-param.model.ts b/src/app/core/cache/models/search-param.model.ts
index a33bbee5e6..3881dbe8b7 100644
--- a/src/app/core/cache/models/search-param.model.ts
+++ b/src/app/core/cache/models/search-param.model.ts
@@ -1,6 +1,6 @@
 
 /**
- * Class representing a query parameter (query?fieldName=fieldValue) used in FindAllOptions object
+ * Class representing a query parameter (query?fieldName=fieldValue) used in FindListOptions object
  */
 export class SearchParam {
   constructor(public fieldName: string, public fieldValue: any) {
diff --git a/src/app/core/cache/object-cache.service.ts b/src/app/core/cache/object-cache.service.ts
index e12629fa27..8d4e910471 100644
--- a/src/app/core/cache/object-cache.service.ts
+++ b/src/app/core/cache/object-cache.service.ts
@@ -196,8 +196,9 @@ export class ObjectCacheService {
    *    false otherwise
    */
   hasByUUID(uuid: string): boolean {
-    let result: boolean;
+    let result = false;
 
+    /* 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)
diff --git a/src/app/core/cache/response.models.ts b/src/app/core/cache/response.models.ts
index 03233e616b..3915eca23f 100644
--- a/src/app/core/cache/response.models.ts
+++ b/src/app/core/cache/response.models.ts
@@ -1,9 +1,9 @@
-import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
+import { SearchQueryResponse } from '../../shared/search/search-query-response.model';
 import { RequestError } from '../data/request.models';
 import { PageInfo } from '../shared/page-info.model';
 import { ConfigObject } from '../config/models/config.model';
-import { FacetValue } from '../../+search-page/search-service/facet-value.model';
-import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model';
+import { FacetValue } from '../../shared/search/facet-value.model';
+import { SearchFilterConfig } from '../../shared/search/search-filter-config.model';
 import { IntegrationModel } from '../integration/models/integration.model';
 import { RegistryMetadataschemasResponse } from '../registry/registry-metadataschemas-response.model';
 import { RegistryMetadatafieldsResponse } from '../registry/registry-metadatafields-response.model';
diff --git a/src/app/core/config/config.service.spec.ts b/src/app/core/config/config.service.spec.ts
index 87add6b656..402ee88b81 100644
--- a/src/app/core/config/config.service.spec.ts
+++ b/src/app/core/config/config.service.spec.ts
@@ -3,7 +3,7 @@ import { TestScheduler } from 'rxjs/testing';
 import { getMockRequestService } from '../../shared/mocks/mock-request.service';
 import { ConfigService } from './config.service';
 import { RequestService } from '../data/request.service';
-import { ConfigRequest, FindAllOptions } from '../data/request.models';
+import { ConfigRequest, FindListOptions } from '../data/request.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service-stub';
 
@@ -27,7 +27,7 @@ describe('ConfigService', () => {
   let requestService: RequestService;
   let halService: any;
 
-  const findOptions: FindAllOptions = new FindAllOptions();
+  const findOptions: FindListOptions = new FindListOptions();
 
   const scopeName = 'traditional';
   const scopeID = 'd9d30c0c-69b7-4369-8397-ca67c888974d';
diff --git a/src/app/core/config/config.service.ts b/src/app/core/config/config.service.ts
index 340a7a97d6..db14c4a256 100644
--- a/src/app/core/config/config.service.ts
+++ b/src/app/core/config/config.service.ts
@@ -2,7 +2,7 @@ import { merge as observableMerge, Observable, throwError as observableThrowErro
 import { distinctUntilChanged, filter, map, mergeMap, tap } from 'rxjs/operators';
 import { RequestService } from '../data/request.service';
 import { ConfigSuccessResponse } from '../cache/response.models';
-import { ConfigRequest, FindAllOptions, RestRequest } from '../data/request.models';
+import { ConfigRequest, FindListOptions, RestRequest } from '../data/request.models';
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ConfigData } from './config-data';
@@ -35,7 +35,7 @@ export abstract class ConfigService {
     return `${endpoint}/${resourceName}`;
   }
 
-  protected getConfigSearchHref(endpoint, options: FindAllOptions = {}): string {
+  protected getConfigSearchHref(endpoint, options: FindListOptions = {}): string {
     let result;
     const args = [];
 
@@ -93,7 +93,7 @@ export abstract class ConfigService {
       distinctUntilChanged());
   }
 
-  public getConfigBySearch(options: FindAllOptions = {}): Observable<ConfigData> {
+  public getConfigBySearch(options: FindListOptions = {}): Observable<ConfigData> {
     return this.halService.getEndpoint(this.linkPath).pipe(
       map((endpoint: string) => this.getConfigSearchHref(endpoint, options)),
       filter((href: string) => isNotEmpty(href)),
diff --git a/src/app/core/core.effects.ts b/src/app/core/core.effects.ts
index 0eabfc5dc8..9f4242cc9a 100644
--- a/src/app/core/core.effects.ts
+++ b/src/app/core/core.effects.ts
@@ -6,6 +6,7 @@ import { JsonPatchOperationsEffects } from './json-patch/json-patch-operations.e
 import { ServerSyncBufferEffects } from './cache/server-sync-buffer.effects';
 import { ObjectUpdatesEffects } from './data/object-updates/object-updates.effects';
 import { RouteEffects } from './services/route.effects';
+import { RouterEffects } from './router/router.effects';
 
 export const coreEffects = [
   RequestEffects,
@@ -15,5 +16,6 @@ export const coreEffects = [
   JsonPatchOperationsEffects,
   ServerSyncBufferEffects,
   ObjectUpdatesEffects,
-  RouteEffects
+  RouteEffects,
+  RouterEffects
 ];
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 67685a3b84..55fe376294 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -53,7 +53,7 @@ import { UUIDService } from './shared/uuid.service';
 import { AuthenticatedGuard } from './auth/authenticated.guard';
 import { AuthRequestService } from './auth/auth-request.service';
 import { AuthResponseParsingService } from './auth/auth-response-parsing.service';
-import { HTTP_INTERCEPTORS } from '@angular/common/http';
+import { HTTP_INTERCEPTORS, HttpClient } from '@angular/common/http';
 import { AuthInterceptor } from './auth/auth.interceptor';
 import { HALEndpointService } from './shared/hal-endpoint.service';
 import { FacetValueResponseParsingService } from './data/facet-value-response-parsing.service';
@@ -80,7 +80,8 @@ import { NormalizedObjectBuildService } from './cache/builders/normalized-object
 import { DSOChangeAnalyzer } from './data/dso-change-analyzer.service';
 import { ObjectUpdatesService } from './data/object-updates/object-updates.service';
 import { DefaultChangeAnalyzer } from './data/default-change-analyzer.service';
-import { SearchService } from '../+search-page/search-service/search.service';
+import { SearchService } from './shared/search/search.service';
+import { RelationshipService } from './data/relationship.service';
 import { NormalizedCollection } from './cache/models/normalized-collection.model';
 import { NormalizedCommunity } from './cache/models/normalized-community.model';
 import { NormalizedDSpaceObject } from './cache/models/normalized-dspace-object.model';
@@ -101,7 +102,6 @@ import { NormalizedSubmissionFormsModel } from './config/models/normalized-confi
 import { NormalizedSubmissionSectionModel } from './config/models/normalized-config-submission-section.model';
 import { NormalizedAuthStatus } from './auth/models/normalized-auth-status.model';
 import { NormalizedAuthorityValue } from './integration/models/normalized-authority-value.model';
-import { RelationshipService } from './data/relationship.service';
 import { RoleService } from './roles/role.service';
 import { MyDSpaceGuard } from '../+my-dspace-page/my-dspace.guard';
 import { MyDSpaceResponseParsingService } from './data/mydspace-response-parsing.service';
@@ -122,6 +122,37 @@ import { BrowseDefinition } from './shared/browse-definition.model';
 import { ItemTemplateDataService } from './data/item-template-data.service';
 import { MappedCollectionsReponseParsingService } from './data/mapped-collections-reponse-parsing.service';
 import { ObjectSelectService } from '../shared/object-select/object-select.service';
+import { SiteDataService } from './data/site-data.service';
+import { NormalizedSite } from './cache/models/normalized-site.model';
+
+import {
+  MOCK_RESPONSE_MAP,
+  MockResponseMap,
+  mockResponseMap
+} from '../shared/mocks/dspace-rest-v2/mocks/mock-response-map';
+import { EndpointMockingRestService } from '../shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service';
+import { ENV_CONFIG, GLOBAL_CONFIG, GlobalConfig } from '../../config';
+import { SearchFilterService } from './shared/search/search-filter.service';
+import { SearchConfigurationService } from './shared/search/search-configuration.service';
+import { SelectableListService } from '../shared/object-list/selectable-list/selectable-list.service';
+import { RelationshipTypeService } from './data/relationship-type.service';
+import { SidebarService } from '../shared/sidebar/sidebar.service';
+import { NormalizedExternalSource } from './cache/models/normalized-external-source.model';
+import { NormalizedExternalSourceEntry } from './cache/models/normalized-external-source-entry.model';
+import { ExternalSourceService } from './data/external-source.service';
+import { LookupRelationService } from './data/lookup-relation.service';
+
+/**
+ * When not in production, endpoint responses can be mocked for testing purposes
+ * If there is no mock version available for the endpoint, the actual REST response will be used just like in production mode
+ */
+export const restServiceFactory = (cfg: GlobalConfig, mocks: MockResponseMap, http: HttpClient) => {
+  if (ENV_CONFIG.production) {
+    return new DSpaceRESTv2Service(http);
+  } else {
+    return new EndpointMockingRestService(cfg, mocks, http);
+  }
+};
 
 const IMPORTS = [
   CommonModule,
@@ -140,8 +171,10 @@ const PROVIDERS = [
   AuthResponseParsingService,
   CommunityDataService,
   CollectionDataService,
+  SiteDataService,
   DSOResponseParsingService,
-  DSpaceRESTv2Service,
+  { provide: MOCK_RESPONSE_MAP, useValue: mockResponseMap },
+  { provide: DSpaceRESTv2Service, useFactory: restServiceFactory, deps: [GLOBAL_CONFIG, MOCK_RESPONSE_MAP, HttpClient]},
   DynamicFormLayoutService,
   DynamicFormService,
   DynamicFormValidationService,
@@ -213,6 +246,15 @@ const PROVIDERS = [
   ClaimedTaskDataService,
   PoolTaskDataService,
   ItemTemplateDataService,
+  SearchService,
+  SidebarService,
+  SearchFilterService,
+  SearchFilterService,
+  SearchConfigurationService,
+  SelectableListService,
+  RelationshipTypeService,
+  ExternalSourceService,
+  LookupRelationService,
   // register AuthInterceptor as HttpInterceptor
   {
     provide: HTTP_INTERCEPTORS,
@@ -234,6 +276,7 @@ export const normalizedModels =
     NormalizedBitstream,
     NormalizedBitstreamFormat,
     NormalizedItem,
+    NormalizedSite,
     NormalizedCollection,
     NormalizedCommunity,
     NormalizedEPerson,
@@ -257,7 +300,9 @@ export const normalizedModels =
     NormalizedPoolTask,
     NormalizedRelationship,
     NormalizedRelationshipType,
-    NormalizedItemType
+    NormalizedItemType,
+    NormalizedExternalSource,
+    NormalizedExternalSourceEntry
   ];
 
 @NgModule({
diff --git a/src/app/core/core.reducers.ts b/src/app/core/core.reducers.ts
index 4fcf36f9cc..78391eee3f 100644
--- a/src/app/core/core.reducers.ts
+++ b/src/app/core/core.reducers.ts
@@ -1,7 +1,4 @@
-import {
-  ActionReducerMap,
-  createFeatureSelector,
-} from '@ngrx/store';
+import { ActionReducerMap, } from '@ngrx/store';
 
 import { objectCacheReducer, ObjectCacheState } from './cache/object-cache.reducer';
 import { indexReducer, MetaIndexState } from './index/index.reducer';
@@ -9,17 +6,21 @@ import { requestReducer, RequestState } from './data/request.reducer';
 import { authReducer, AuthState } from './auth/auth.reducer';
 import { jsonPatchOperationsReducer, JsonPatchOperationsState } from './json-patch/json-patch-operations.reducer';
 import { serverSyncBufferReducer, ServerSyncBufferState } from './cache/server-sync-buffer.reducer';
-import {
-  objectUpdatesReducer,
-  ObjectUpdatesState
-} from './data/object-updates/object-updates.reducer';
+import { objectUpdatesReducer, ObjectUpdatesState } from './data/object-updates/object-updates.reducer';
 import { routeReducer, RouteState } from './services/route.reducer';
+import {
+  bitstreamFormatReducer,
+  BitstreamFormatRegistryState
+} from '../+admin/admin-registries/bitstream-formats/bitstream-format.reducers';
+import { historyReducer, HistoryState } from './history/history.reducer';
 
 export interface CoreState {
+  'bitstreamFormats': BitstreamFormatRegistryState;
   'cache/object': ObjectCacheState,
   'cache/syncbuffer': ServerSyncBufferState,
   'cache/object-updates': ObjectUpdatesState
   'data/request': RequestState,
+  'history': HistoryState;
   'index': MetaIndexState,
   'auth': AuthState,
   'json/patch': JsonPatchOperationsState,
@@ -27,10 +28,12 @@ export interface CoreState {
 }
 
 export const coreReducers: ActionReducerMap<CoreState> = {
+  'bitstreamFormats': bitstreamFormatReducer,
   'cache/object': objectCacheReducer,
   'cache/syncbuffer': serverSyncBufferReducer,
   'cache/object-updates': objectUpdatesReducer,
   'data/request': requestReducer,
+  'history': historyReducer,
   'index': indexReducer,
   'auth': authReducer,
   'json/patch': jsonPatchOperationsReducer,
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 f3ce478236..c626fcd6e2 100644
--- a/src/app/core/data/bitstream-format-data.service.spec.ts
+++ b/src/app/core/data/bitstream-format-data.service.spec.ts
@@ -3,7 +3,6 @@ import { RequestEntry } from './request.reducer';
 import { RestResponse } from '../cache/response.models';
 import { Observable, of as observableOf } from 'rxjs';
 import { Action, Store } from '@ngrx/store';
-import { CoreState } from '../core.reducers';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { cold, getTestScheduler, hot } from 'jasmine-marbles';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
@@ -19,6 +18,7 @@ import {
   BitstreamFormatsRegistrySelectAction
 } from '../../+admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { TestScheduler } from 'rxjs/testing';
+import { CoreState } from '../core.reducers';
 
 describe('BitstreamFormatDataService', () => {
   let service: BitstreamFormatDataService;
diff --git a/src/app/core/data/bitstream-format-data.service.ts b/src/app/core/data/bitstream-format-data.service.ts
index bdf9b16acf..c30330a0a3 100644
--- a/src/app/core/data/bitstream-format-data.service.ts
+++ b/src/app/core/data/bitstream-format-data.service.ts
@@ -5,19 +5,17 @@ import { RequestService } from './request.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { createSelector, select, Store } from '@ngrx/store';
-import { CoreState } from '../core.reducers';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { HttpClient } from '@angular/common/http';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { DeleteByIDRequest, FindAllOptions, PostRequest, PutRequest } from './request.models';
+import { DeleteByIDRequest, FindListOptions, PostRequest, PutRequest } from './request.models';
 import { Observable } from 'rxjs';
 import { find, map, tap } from 'rxjs/operators';
 import { configureRequest, getResponseFromEntry } from '../shared/operators';
 import { distinctUntilChanged } from 'rxjs/internal/operators/distinctUntilChanged';
 import { RestResponse } from '../cache/response.models';
-import { AppState } from '../../app.reducer';
 import { BitstreamFormatRegistryState } from '../../+admin/admin-registries/bitstream-formats/bitstream-format.reducers';
 import {
   BitstreamFormatsRegistryDeselectAction,
@@ -26,8 +24,13 @@ import {
 } from '../../+admin/admin-registries/bitstream-formats/bitstream-format.actions';
 import { hasValue } from '../../shared/empty.util';
 import { RequestEntry } from './request.reducer';
+import { CoreState } from '../core.reducers';
+import { coreSelector } from '../core.selectors';
 
-const bitstreamFormatsStateSelector = (state: AppState) => state.bitstreamFormats;
+const bitstreamFormatsStateSelector = createSelector(
+  coreSelector,
+  (state: CoreState) => state.bitstreamFormats
+);
 const selectedBitstreamFormatSelector = createSelector(bitstreamFormatsStateSelector,
   (bitstreamFormatRegistryState: BitstreamFormatRegistryState) => bitstreamFormatRegistryState.selectedBitstreamFormats);
 
@@ -54,10 +57,11 @@ export class BitstreamFormatDataService extends DataService<BitstreamFormat> {
 
   /**
    * Get the endpoint for browsing bitstream formats
-   * @param {FindAllOptions} options
+   * @param {FindListOptions} options
+   * @param {string} linkPath
    * @returns {Observable<string>}
    */
-  getBrowseEndpoint(options: FindAllOptions = {}, linkPath?: string): Observable<string> {
+  getBrowseEndpoint(options: FindListOptions = {}, linkPath?: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath);
   }
 
@@ -99,7 +103,7 @@ export class BitstreamFormatDataService extends DataService<BitstreamFormat> {
 
   /**
    * Create a new BitstreamFormat
-   * @param BitstreamFormat
+   * @param {BitstreamFormat} bitstreamFormat
    */
   public createBitstreamFormat(bitstreamFormat: BitstreamFormat): Observable<RestResponse> {
     const requestId = this.requestService.generateRequestId();
diff --git a/src/app/core/data/bundle-data.service.ts b/src/app/core/data/bundle-data.service.ts
index 5962488c4f..280f727aad 100644
--- a/src/app/core/data/bundle-data.service.ts
+++ b/src/app/core/data/bundle-data.service.ts
@@ -11,7 +11,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { HttpClient } from '@angular/common/http';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { FindAllOptions } from './request.models';
+import { FindListOptions } from './request.models';
 import { Observable } from 'rxjs/internal/Observable';
 
 /**
@@ -37,10 +37,10 @@ export class BundleDataService extends DataService<Bundle> {
 
   /**
    * Get the endpoint for browsing bundles
-   * @param {FindAllOptions} options
+   * @param {FindListOptions} options
    * @returns {Observable<string>}
    */
-  getBrowseEndpoint(options: FindAllOptions = {}, linkPath?: string): Observable<string> {
+  getBrowseEndpoint(options: FindListOptions = {}, linkPath?: string): Observable<string> {
     return this.halService.getEndpoint(this.linkPath);
   }
 }
diff --git a/src/app/core/data/change-analyzer.ts b/src/app/core/data/change-analyzer.ts
index 6b5a69259b..c45c9e55b7 100644
--- a/src/app/core/data/change-analyzer.ts
+++ b/src/app/core/data/change-analyzer.ts
@@ -17,5 +17,5 @@ export interface ChangeAnalyzer<T extends CacheableObject> {
    * @param {NormalizedObject} object2
    *    The second object to compare
    */
-  diff(object1: T | NormalizedObject<T>, object2: T | NormalizedObject<T>):  Operation[];
+  diff(object1: T | NormalizedObject<T>, object2: T | NormalizedObject<T>): Operation[];
 }
diff --git a/src/app/core/data/collection-data.service.ts b/src/app/core/data/collection-data.service.ts
index 7ec31d8970..0c032e6766 100644
--- a/src/app/core/data/collection-data.service.ts
+++ b/src/app/core/data/collection-data.service.ts
@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 
-import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, switchMap, take } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -16,7 +16,7 @@ import { HttpClient } from '@angular/common/http';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
 import { Observable } from 'rxjs/internal/Observable';
-import { FindAllOptions, GetRequest } from './request.models';
+import {FindListOptions, FindListRequest, GetRequest} from './request.models';
 import { RemoteData } from './remote-data';
 import { PaginatedList } from './paginated-list';
 import { configureRequest } from '../shared/operators';
@@ -25,8 +25,8 @@ import { ResponseParsingService } from './parsing.service';
 import { GenericConstructor } from '../shared/generic-constructor';
 import { hasValue, isNotEmptyOperator } from '../../shared/empty.util';
 import { DSpaceObject } from '../shared/dspace-object.model';
-import { PaginatedSearchOptions } from '../../+search-page/paginated-search-options.model';
 import { SearchParam } from '../cache/models/search-param.model';
+import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
 
 @Injectable()
 export class CollectionDataService extends ComColDataService<Collection> {
@@ -50,11 +50,11 @@ export class CollectionDataService extends ComColDataService<Collection> {
   /**
    * Get all collections the user is authorized to submit to
    *
-   * @param options The [[FindAllOptions]] object
+   * @param options The [[FindListOptions]] object
    * @return Observable<RemoteData<PaginatedList<Collection>>>
    *    collection list
    */
-  getAuthorizedCollection(options: FindAllOptions = {}): Observable<RemoteData<PaginatedList<Collection>>> {
+  getAuthorizedCollection(options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Collection>>> {
     const searchHref = 'findAuthorized';
 
     return this.searchBy(searchHref, options).pipe(
@@ -65,13 +65,15 @@ export class CollectionDataService extends ComColDataService<Collection> {
    * Get all collections the user is authorized to submit to, by community
    *
    * @param communityId The community id
-   * @param options The [[FindAllOptions]] object
+   * @param options The [[FindListOptions]] object
    * @return Observable<RemoteData<PaginatedList<Collection>>>
    *    collection list
    */
-  getAuthorizedCollectionByCommunity(communityId: string, options: FindAllOptions = {}): Observable<RemoteData<PaginatedList<Collection>>> {
+  getAuthorizedCollectionByCommunity(communityId: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Collection>>> {
     const searchHref = 'findAuthorizedByCommunity';
-    options.searchParams = [new SearchParam('uuid', communityId)];
+    options = Object.assign({}, options, {
+      searchParams: [new SearchParam('uuid', communityId)]
+    });
 
     return this.searchBy(searchHref, options).pipe(
       filter((collections: RemoteData<PaginatedList<Collection>>) => !collections.isResponsePending));
@@ -85,7 +87,7 @@ export class CollectionDataService extends ComColDataService<Collection> {
    */
   hasAuthorizedCollection(): Observable<boolean> {
     const searchHref = 'findAuthorized';
-    const options = new FindAllOptions();
+    const options = new FindListOptions();
     options.elementsPerPage = 1;
 
     return this.searchBy(searchHref, options).pipe(
@@ -136,4 +138,10 @@ export class CollectionDataService extends ComColDataService<Collection> {
     return this.rdbService.buildList(href$);
   }
 
+  protected getFindByParentHref(parentUUID: string): Observable<string> {
+    return this.halService.getEndpoint('communities').pipe(
+      switchMap((communityEndpointHref: string) =>
+        this.halService.getEndpoint('collections', `${communityEndpointHref}/${parentUUID}`)),
+    );
+  }
 }
diff --git a/src/app/core/data/comcol-data.service.spec.ts b/src/app/core/data/comcol-data.service.spec.ts
index 5cc474dff9..a7fcd205d4 100644
--- a/src/app/core/data/comcol-data.service.spec.ts
+++ b/src/app/core/data/comcol-data.service.spec.ts
@@ -8,12 +8,12 @@ import { ObjectCacheService } from '../cache/object-cache.service';
 import { CoreState } from '../core.reducers';
 import { ComColDataService } from './comcol-data.service';
 import { CommunityDataService } from './community-data.service';
-import { FindAllOptions, FindByIDRequest } from './request.models';
+import { FindListOptions, FindByIDRequest } from './request.models';
 import { RequestService } from './request.service';
 import { NormalizedObject } from '../cache/models/normalized-object.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RequestEntry } from './request.reducer';
-import { of as observableOf } from 'rxjs';
+import {Observable, of as observableOf} from 'rxjs';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { HttpClient } from '@angular/common/http';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
@@ -45,6 +45,11 @@ class TestService extends ComColDataService<any> {
   ) {
     super();
   }
+
+  protected getFindByParentHref(parentUUID: string): Observable<string> {
+    // implementation in subclasses for communities/collections
+    return undefined;
+  }
 }
 
 /* tslint:enable:max-classes-per-file */
@@ -66,7 +71,7 @@ describe('ComColDataService', () => {
   const dataBuildService = {} as NormalizedObjectBuildService;
 
   const scopeID = 'd9d30c0c-69b7-4369-8397-ca67c888974d';
-  const options = Object.assign(new FindAllOptions(), {
+  const options = Object.assign(new FindListOptions(), {
     scopeID: scopeID
   });
   const getRequestEntry$ = (successful: boolean) => {
diff --git a/src/app/core/data/comcol-data.service.ts b/src/app/core/data/comcol-data.service.ts
index 68eb3e4880..2ce0362a4e 100644
--- a/src/app/core/data/comcol-data.service.ts
+++ b/src/app/core/data/comcol-data.service.ts
@@ -1,21 +1,41 @@
-import { distinctUntilChanged, filter, map, mergeMap, share, take, tap } from 'rxjs/operators';
-import { merge as observableMerge, Observable, throwError as observableThrowError } from 'rxjs';
-import { isEmpty, isNotEmpty } from '../../shared/empty.util';
+import {
+  distinctUntilChanged,
+  filter, first,map, mergeMap, share, switchMap,
+  take,
+  tap
+} from 'rxjs/operators';
+import { merge as observableMerge, Observable, throwError as observableThrowError, combineLatest as observableCombineLatest } from 'rxjs';
+import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { NormalizedCommunity } from '../cache/models/normalized-community.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { CommunityDataService } from './community-data.service';
 
 import { DataService } from './data.service';
-import { FindAllOptions, FindByIDRequest } from './request.models';
+import { DeleteRequest, FindListOptions, FindByIDRequest, RestRequest } from './request.models';
+import { PaginatedList } from './paginated-list';
+import { RemoteData } from './remote-data';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { getResponseFromEntry } from '../shared/operators';
+import {
+  configureRequest,
+  getRemoteDataPayload,
+  getResponseFromEntry,
+  getSucceededRemoteData
+} from '../shared/operators';
 import { CacheableObject } from '../cache/object-cache.reducer';
+import { RestResponse } from '../cache/response.models';
+import { Bitstream } from '../shared/bitstream.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
 
 export abstract class ComColDataService<T extends CacheableObject> extends DataService<T> {
   protected abstract cds: CommunityDataService;
   protected abstract objectCache: ObjectCacheService;
   protected abstract halService: HALEndpointService;
 
+  /**
+   * Linkpath of endpoint to delete the logo
+   */
+  protected logoDeleteLinkpath = 'bitstreams';
+
   /**
    * Get the scoped endpoint URL by fetching the object with
    * the given scopeID and returning its HAL link with this
@@ -26,7 +46,7 @@ export abstract class ComColDataService<T extends CacheableObject> extends DataS
    * @return { Observable<string> }
    *    an Observable<string> containing the scoped URL
    */
-  public getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
     if (isEmpty(options.scopeID)) {
       return this.halService.getEndpoint(linkPath);
     } else {
@@ -57,4 +77,41 @@ export abstract class ComColDataService<T extends CacheableObject> extends DataS
       return observableMerge(errorResponses, successResponses).pipe(distinctUntilChanged(), share());
     }
   }
+
+  protected abstract getFindByParentHref(parentUUID: string): Observable<string>;
+
+  public findByParent(parentUUID: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<T>>> {
+    const href$ = this.buildHrefFromFindOptions(this.getFindByParentHref(parentUUID), [], options);
+    return this.findList(href$, options);
+  }
+
+  /**
+   * Get the endpoint for the community or collection's logo
+   * @param id  The community or collection's ID
+   */
+  public getLogoEndpoint(id: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      switchMap((href: string) => this.halService.getEndpoint('logo', `${href}/${id}`))
+    )
+  }
+
+  /**
+   * Delete the logo from the community or collection
+   * @param dso The object to delete the logo from
+   */
+  public deleteLogo(dso: DSpaceObject): Observable<RestResponse> {
+    const logo$ = (dso as any).logo;
+    if (hasValue(logo$)) {
+      return observableCombineLatest(
+        logo$.pipe(getSucceededRemoteData(), getRemoteDataPayload(), take(1)),
+        this.halService.getEndpoint(this.logoDeleteLinkpath)
+      ).pipe(
+        map(([logo, href]: [Bitstream, string]) => `${href}/${logo.id}`),
+        map((href: string) => new DeleteRequest(this.requestService.generateRequestId(), href)),
+        configureRequest(this.requestService),
+        switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)),
+        getResponseFromEntry()
+      );
+    }
+  }
 }
diff --git a/src/app/core/data/community-data.service.ts b/src/app/core/data/community-data.service.ts
index cc55fe6869..57bf64678f 100644
--- a/src/app/core/data/community-data.service.ts
+++ b/src/app/core/data/community-data.service.ts
@@ -1,4 +1,4 @@
-import { filter, take } from 'rxjs/operators';
+import { filter, switchMap, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 
 import { Store } from '@ngrx/store';
@@ -9,7 +9,7 @@ import { Community } from '../shared/community.model';
 import { ComColDataService } from './comcol-data.service';
 import { RequestService } from './request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FindAllOptions, FindAllRequest } from './request.models';
+import { FindListOptions, FindListRequest } from './request.models';
 import { RemoteData } from './remote-data';
 import { hasValue } from '../../shared/empty.util';
 import { Observable } from 'rxjs';
@@ -43,16 +43,24 @@ export class CommunityDataService extends ComColDataService<Community> {
     return this.halService.getEndpoint(this.linkPath);
   }
 
-  findTop(options: FindAllOptions = {}): Observable<RemoteData<PaginatedList<Community>>> {
+  findTop(options: FindListOptions = {}): Observable<RemoteData<PaginatedList<Community>>> {
     const hrefObs = this.getFindAllHref(options, this.topLinkPath);
     hrefObs.pipe(
       filter((href: string) => hasValue(href)),
       take(1))
       .subscribe((href: string) => {
-        const request = new FindAllRequest(this.requestService.generateRequestId(), href, options);
+        const request = new FindListRequest(this.requestService.generateRequestId(), href, options);
         this.requestService.configure(request);
       });
 
     return this.rdbService.buildList<Community>(hrefObs) as Observable<RemoteData<PaginatedList<Community>>>;
   }
+
+  protected getFindByParentHref(parentUUID: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      switchMap((communityEndpointHref: string) =>
+        this.halService.getEndpoint('subcommunities', `${communityEndpointHref}/${parentUUID}`))
+    );
+  }
+
 }
diff --git a/src/app/core/data/data.service.spec.ts b/src/app/core/data/data.service.spec.ts
index ab3cf0ac16..ca5f2cc12e 100644
--- a/src/app/core/data/data.service.spec.ts
+++ b/src/app/core/data/data.service.spec.ts
@@ -6,7 +6,7 @@ import { CoreState } from '../core.reducers';
 import { Store } from '@ngrx/store';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Observable, of as observableOf } from 'rxjs';
-import { FindAllOptions } from './request.models';
+import { FindListOptions } from './request.models';
 import { SortDirection, SortOptions } from '../cache/models/sort-options.model';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { compare, Operation } from 'fast-json-patch';
@@ -16,6 +16,8 @@ import { HttpClient } from '@angular/common/http';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { Item } from '../shared/item.model';
+import * as uuidv4 from 'uuid/v4';
+import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
 
 const endpoint = 'https://rest.api/core';
 
@@ -40,7 +42,7 @@ class TestService extends DataService<any> {
     super();
   }
 
-  public getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
     return observableOf(endpoint);
   }
 }
@@ -51,10 +53,11 @@ class DummyChangeAnalyzer implements ChangeAnalyzer<NormalizedTestObject> {
   }
 
 }
+
 describe('DataService', () => {
   let service: TestService;
-  let options: FindAllOptions;
-  const requestService = {} as RequestService;
+  let options: FindListOptions;
+  const requestService = {generateRequestId: () => uuidv4()} as RequestService;
   const halService = {} as HALEndpointService;
   const rdbService = {} as RemoteDataBuildService;
   const notificationsService = {} as NotificationsService;
@@ -87,6 +90,7 @@ describe('DataService', () => {
       comparator,
     );
   }
+
   service = initTestService();
 
   describe('getFindAllHref', () => {
@@ -188,8 +192,7 @@ describe('DataService', () => {
       dso2.self = selfLink;
       dso2.metadata = [{ key: 'dc.title', value: name2 }];
 
-      spyOn(service, 'findById').and.returnValues(observableOf(dso));
-      spyOn(objectCache, 'getObjectBySelfLink').and.returnValues(observableOf(dso));
+      spyOn(service, 'findByHref').and.returnValue(createSuccessfulRemoteDataObject$(dso));
       spyOn(objectCache, 'addPatch');
     });
 
diff --git a/src/app/core/data/data.service.ts b/src/app/core/data/data.service.ts
index a93916a4b8..04d1990eac 100644
--- a/src/app/core/data/data.service.ts
+++ b/src/app/core/data/data.service.ts
@@ -1,12 +1,22 @@
 import { HttpClient } from '@angular/common/http';
 
 import { Observable } from 'rxjs';
-import { distinctUntilChanged, filter, find, first, map, mergeMap, switchMap, take } from 'rxjs/operators';
+import {
+  distinctUntilChanged,
+  filter,
+  find,
+  first,
+  map,
+  mergeMap,
+  skipWhile,
+  switchMap,
+  take,
+  tap
+} from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 
 import { hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { CoreState } from '../core.reducers';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { URLCombiner } from '../url-combiner/url-combiner';
 import { PaginatedList } from './paginated-list';
@@ -14,9 +24,9 @@ import { RemoteData } from './remote-data';
 import {
   CreateRequest,
   DeleteByIDRequest,
-  FindAllOptions,
-  FindAllRequest,
   FindByIDRequest,
+  FindListOptions,
+  FindListRequest,
   GetRequest
 } from './request.models';
 import { RequestService } from './request.service';
@@ -27,7 +37,7 @@ import { Operation } from 'fast-json-patch';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { DSpaceObject } from '../shared/dspace-object.model';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { configureRequest, getResponseFromEntry } from '../shared/operators';
+import { configureRequest, getRemoteDataPayload, getResponseFromEntry, getSucceededRemoteData } from '../shared/operators';
 import { ErrorResponse, RestResponse } from '../cache/response.models';
 import { NotificationOptions } from '../../shared/notifications/models/notification-options.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
@@ -38,6 +48,7 @@ import { ChangeAnalyzer } from './change-analyzer';
 import { RestRequestMethod } from './rest-request-method';
 import { getMapsToType } from '../cache/builders/build-decorators';
 import { UpdateDataService } from './update-data.service';
+import { CoreState } from '../core.reducers';
 
 export abstract class DataService<T extends CacheableObject> implements UpdateDataService<T> {
   protected abstract requestService: RequestService;
@@ -55,7 +66,7 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
    */
   protected responseMsToLive: number;
 
-  public abstract getBrowseEndpoint(options: FindAllOptions, linkPath?: string): Observable<string>
+  public abstract getBrowseEndpoint(options: FindListOptions, linkPath?: string): Observable<string>
 
   /**
    * Get the base endpoint for all requests
@@ -67,12 +78,12 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
   /**
    * Create the HREF with given options object
    *
-   * @param options The [[FindAllOptions]] object
+   * @param options The [[FindListOptions]] object
    * @param linkPath The link path for the object
    * @return {Observable<string>}
    *    Return an observable that emits created HREF
    */
-  protected getFindAllHref(options: FindAllOptions = {}, linkPath?: string): Observable<string> {
+  protected getFindAllHref(options: FindListOptions = {}, linkPath?: string): Observable<string> {
     let result: Observable<string>;
     const args = [];
 
@@ -85,11 +96,11 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
    * 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 [[FindAllOptions]] object
+   * @param options The [[FindListOptions]] object
    * @return {Observable<string>}
    *    Return an observable that emits created HREF
    */
-  protected getSearchByHref(searchMethod: string, options: FindAllOptions = {}): Observable<string> {
+  protected getSearchByHref(searchMethod: string, options: FindListOptions = {}): Observable<string> {
     let result: Observable<string>;
     const args = [];
 
@@ -109,11 +120,11 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
    *
    * @param href$ The HREF to which the query string should be appended
    * @param args Array with additional params to combine with query string
-   * @param options The [[FindAllOptions]] object
+   * @param options The [[FindListOptions]] object
    * @return {Observable<string>}
    *    Return an observable that emits created HREF
    */
-  protected buildHrefFromFindOptions(href$: Observable<string>, args: string[], options: FindAllOptions): Observable<string> {
+  protected buildHrefFromFindOptions(href$: Observable<string>, args: string[], options: FindListOptions): Observable<string> {
 
     if (hasValue(options.currentPage) && typeof options.currentPage === 'number') {
       /* TODO: this is a temporary fix for the pagination start index (0 or 1) discrepancy between the rest and the frontend respectively */
@@ -135,20 +146,22 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
     }
   }
 
-  findAll(options: FindAllOptions = {}): Observable<RemoteData<PaginatedList<T>>> {
-    const hrefObs = this.getFindAllHref(options);
+  findAll(options: FindListOptions = {}): Observable<RemoteData<PaginatedList<T>>> {
+    return this.findList(this.getFindAllHref(options), options);
+  }
 
-    hrefObs.pipe(
+  protected findList(href$, options: FindListOptions) {
+    href$.pipe(
       first((href: string) => hasValue(href)))
       .subscribe((href: string) => {
-        const request = new FindAllRequest(this.requestService.generateRequestId(), href, options);
+        const request = new FindListRequest(this.requestService.generateRequestId(), href, options);
         if (hasValue(this.responseMsToLive)) {
           request.responseMsToLive = this.responseMsToLive;
         }
         this.requestService.configure(request);
       });
 
-    return this.rdbService.buildList<T>(hrefObs) as Observable<RemoteData<PaginatedList<T>>>;
+    return this.rdbService.buildList<T>(href$) as Observable<RemoteData<PaginatedList<T>>>;
   }
 
   /**
@@ -206,26 +219,33 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
   }
 
   /**
-   * Make a new FindAllRequest with given search method
+   * Make a new FindListRequest with given search method
    *
    * @param searchMethod The search method for the object
-   * @param options The [[FindAllOptions]] object
+   * @param options The [[FindListOptions]] object
    * @return {Observable<RemoteData<PaginatedList<T>>}
    *    Return an observable that emits response from the server
    */
-  protected searchBy(searchMethod: string, options: FindAllOptions = {}): Observable<RemoteData<PaginatedList<T>>> {
+  protected searchBy(searchMethod: string, options: FindListOptions = {}): Observable<RemoteData<PaginatedList<T>>> {
 
     const hrefObs = this.getSearchByHref(searchMethod, options);
 
-    hrefObs.pipe(
-      first((href: string) => hasValue(href)))
-      .subscribe((href: string) => {
-        const request = new FindAllRequest(this.requestService.generateRequestId(), href, options);
-        request.responseMsToLive = 10 * 1000;
-        this.requestService.configure(request);
-      });
+    return hrefObs.pipe(
+      find((href: string) => hasValue(href)),
+      tap((href: string) => {
+          this.requestService.removeByHrefSubstring(href);
+          const request = new FindListRequest(this.requestService.generateRequestId(), href, options);
+          request.responseMsToLive = 10 * 1000;
 
-    return this.rdbService.buildList<T>(hrefObs) as Observable<RemoteData<PaginatedList<T>>>;
+          this.requestService.configure(request);
+        }
+      ),
+      switchMap((href) => this.requestService.getByHref(href)),
+      skipWhile((requestEntry) => hasValue(requestEntry) && requestEntry.completed),
+      switchMap((href) =>
+        this.rdbService.buildList<T>(hrefObs) as Observable<RemoteData<PaginatedList<T>>>
+      )
+    );
   }
 
   /**
@@ -243,16 +263,18 @@ export abstract class DataService<T extends CacheableObject> implements UpdateDa
    * @param {DSpaceObject} object The given object
    */
   update(object: T): Observable<RemoteData<T>> {
-    const oldVersion$ = this.objectCache.getObjectBySelfLink(object.self);
-    return oldVersion$.pipe(take(1), mergeMap((oldVersion: T) => {
+    const oldVersion$ = this.findByHref(object.self);
+    return oldVersion$.pipe(
+      getSucceededRemoteData(),
+      getRemoteDataPayload(),
+      mergeMap((oldVersion: T) => {
         const operations = this.comparator.diff(oldVersion, object);
         if (isNotEmpty(operations)) {
           this.objectCache.addPatch(object.self, operations);
         }
-        return this.findById(object.uuid);
+        return this.findByHref(object.self);
       }
     ));
-
   }
 
   /**
diff --git a/src/app/core/data/default-change-analyzer.service.ts b/src/app/core/data/default-change-analyzer.service.ts
index cd30479f6d..862c0e5b85 100644
--- a/src/app/core/data/default-change-analyzer.service.ts
+++ b/src/app/core/data/default-change-analyzer.service.ts
@@ -4,6 +4,7 @@ import { ChangeAnalyzer } from './change-analyzer';
 import { Injectable } from '@angular/core';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { NormalizedObject } from '../cache/models/normalized-object.model';
+import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 
 /**
  * A class to determine what differs between two
@@ -11,6 +12,8 @@ import { NormalizedObject } from '../cache/models/normalized-object.model';
  */
 @Injectable()
 export class DefaultChangeAnalyzer<T extends CacheableObject> implements ChangeAnalyzer<T> {
+  constructor(private normalizeService: NormalizedObjectBuildService) {
+  }
 
   /**
    * Compare the metadata of two CacheableObject and return the differences as
@@ -22,6 +25,6 @@ export class DefaultChangeAnalyzer<T extends CacheableObject> implements ChangeA
    *    The second object to compare
    */
   diff(object1: T | NormalizedObject<T>, object2: T | NormalizedObject<T>): Operation[] {
-    return compare(object1, object2);
+    return compare(this.normalizeService.normalize(object1), this.normalizeService.normalize(object2));
   }
 }
diff --git a/src/app/core/data/dso-redirect-data.service.ts b/src/app/core/data/dso-redirect-data.service.ts
index 7e71f82bbf..f4999637b3 100644
--- a/src/app/core/data/dso-redirect-data.service.ts
+++ b/src/app/core/data/dso-redirect-data.service.ts
@@ -8,7 +8,7 @@ import { RemoteDataBuildService } from '../cache/builders/remote-data-build.serv
 import { RequestService } from './request.service';
 import { Store } from '@ngrx/store';
 import { CoreState } from '../core.reducers';
-import { FindAllOptions, FindByIDRequest, IdentifierType } from './request.models';
+import { FindListOptions, FindByIDRequest, IdentifierType } from './request.models';
 import { Observable } from 'rxjs';
 import { RemoteData } from './remote-data';
 import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
@@ -40,7 +40,7 @@ export class DsoRedirectDataService extends DataService<any> {
     super();
   }
 
-  getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+  getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
     return this.halService.getEndpoint(linkPath);
   }
 
diff --git a/src/app/core/data/dspace-object-data.service.ts b/src/app/core/data/dspace-object-data.service.ts
index bb02afbcd1..002ac3cdbc 100644
--- a/src/app/core/data/dspace-object-data.service.ts
+++ b/src/app/core/data/dspace-object-data.service.ts
@@ -8,7 +8,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { DataService } from './data.service';
 import { RemoteData } from './remote-data';
 import { RequestService } from './request.service';
-import { FindAllOptions } from './request.models';
+import { FindListOptions } from './request.models';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { HttpClient } from '@angular/common/http';
@@ -32,7 +32,7 @@ class DataServiceImpl extends DataService<DSpaceObject> {
     super();
   }
 
-  getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+  getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
     return this.halService.getEndpoint(linkPath);
   }
 
diff --git a/src/app/core/data/external-source.service.spec.ts b/src/app/core/data/external-source.service.spec.ts
new file mode 100644
index 0000000000..77a2a85dfd
--- /dev/null
+++ b/src/app/core/data/external-source.service.spec.ts
@@ -0,0 +1,76 @@
+import { ExternalSourceService } from './external-source.service';
+import { createPaginatedList, createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { ExternalSourceEntry } from '../shared/external-source-entry.model';
+import { of as observableOf } from 'rxjs';
+import { GetRequest } from './request.models';
+
+describe('ExternalSourceService', () => {
+  let service: ExternalSourceService;
+
+  let requestService;
+  let rdbService;
+  let halService;
+
+  const entries = [
+    Object.assign(new ExternalSourceEntry(), {
+      id: '0001-0001-0001-0001',
+      display: 'John Doe',
+      value: 'John, Doe',
+      metadata: {
+        'dc.identifier.uri': [
+          {
+            value: 'https://orcid.org/0001-0001-0001-0001'
+          }
+        ]
+      }
+    }),
+    Object.assign(new ExternalSourceEntry(), {
+      id: '0001-0001-0001-0002',
+      display: 'Sampson Megan',
+      value: 'Sampson, Megan',
+      metadata: {
+        'dc.identifier.uri': [
+          {
+            value: 'https://orcid.org/0001-0001-0001-0002'
+          }
+        ]
+      }
+    })
+  ];
+
+  function init() {
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: 'request-uuid',
+      configure: {}
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildList: createSuccessfulRemoteDataObject$(createPaginatedList(entries))
+    });
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: observableOf('external-sources-REST-endpoint')
+    });
+    service = new ExternalSourceService(requestService, rdbService, undefined, undefined, undefined, halService, undefined, undefined, undefined);
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('getExternalSourceEntries', () => {
+    let result;
+
+    beforeEach(() => {
+      result = service.getExternalSourceEntries('test');
+    });
+
+    it('should configure a GetRequest', () => {
+      expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(GetRequest));
+    });
+
+    it('should return the entries', () => {
+      result.subscribe((resultRD) => {
+        expect(resultRD.payload.page).toBe(entries);
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/external-source.service.ts b/src/app/core/data/external-source.service.ts
new file mode 100644
index 0000000000..c32c13a20f
--- /dev/null
+++ b/src/app/core/data/external-source.service.ts
@@ -0,0 +1,85 @@
+import { Injectable } from '@angular/core';
+import { DataService } from './data.service';
+import { ExternalSource } from '../shared/external-source.model';
+import { RequestService } from './request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { FindListOptions, GetRequest } from './request.models';
+import { Observable } from 'rxjs/internal/Observable';
+import { distinctUntilChanged, map, switchMap } from 'rxjs/operators';
+import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
+import { hasValue, isNotEmptyOperator } from '../../shared/empty.util';
+import { configureRequest } from '../shared/operators';
+import { RemoteData } from './remote-data';
+import { PaginatedList } from './paginated-list';
+import { ExternalSourceEntry } from '../shared/external-source-entry.model';
+import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
+
+/**
+ * A service handling all external source requests
+ */
+@Injectable()
+export class ExternalSourceService extends DataService<ExternalSource> {
+  protected linkPath = 'externalsources';
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected dataBuildService: NormalizedObjectBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DefaultChangeAnalyzer<ExternalSource>) {
+    super();
+  }
+
+  /**
+   * Get the endpoint to browse external sources
+   * @param options
+   * @param linkPath
+   */
+  getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+    return this.halService.getEndpoint(linkPath);
+  }
+
+  /**
+   * Get the endpoint for an external source's entries
+   * @param externalSourceId  The id of the external source to fetch entries for
+   */
+  getEntriesEndpoint(externalSourceId: string): Observable<string> {
+    return this.getBrowseEndpoint().pipe(
+      map((href) => this.getIDHref(href, externalSourceId)),
+      switchMap((href) => this.halService.getEndpoint('entries', href))
+    );
+  }
+
+  /**
+   * Get the entries for an external source
+   * @param externalSourceId  The id of the external source to fetch entries for
+   * @param searchOptions     The search options to limit results to
+   */
+  getExternalSourceEntries(externalSourceId: string, searchOptions?: PaginatedSearchOptions): Observable<RemoteData<PaginatedList<ExternalSourceEntry>>> {
+    const requestUuid = this.requestService.generateRequestId();
+
+    const href$ = this.getEntriesEndpoint(externalSourceId).pipe(
+      isNotEmptyOperator(),
+      distinctUntilChanged(),
+      map((endpoint: string) => hasValue(searchOptions) ? searchOptions.toRestUrl(endpoint) : endpoint)
+    );
+
+    href$.pipe(
+      map((endpoint: string) => new GetRequest(requestUuid, endpoint)),
+      configureRequest(this.requestService)
+    ).subscribe();
+
+    return this.rdbService.buildList(href$);
+  }
+}
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 15f520b249..19b37f8b5d 100644
--- a/src/app/core/data/facet-config-response-parsing.service.ts
+++ b/src/app/core/data/facet-config-response-parsing.service.ts
@@ -7,7 +7,7 @@ import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
-import { SearchFilterConfig } from '../../+search-page/search-service/search-filter-config.model';
+import { SearchFilterConfig } from '../../shared/search/search-filter-config.model';
 import { BaseResponseParsingService } from './base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GlobalConfig } from '../../../config/global-config.interface';
diff --git a/src/app/core/data/facet-value-map-response-parsing.service.ts b/src/app/core/data/facet-value-map-response-parsing.service.ts
index b67cef97c0..64c8e87e7d 100644
--- a/src/app/core/data/facet-value-map-response-parsing.service.ts
+++ b/src/app/core/data/facet-value-map-response-parsing.service.ts
@@ -9,7 +9,7 @@ import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
-import { FacetValue } from '../../+search-page/search-service/facet-value.model';
+import { FacetValue } from '../../shared/search/facet-value.model';
 import { BaseResponseParsingService } from './base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GlobalConfig } from '../../../config/global-config.interface';
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 49d72e0a01..70585bc3d9 100644
--- a/src/app/core/data/facet-value-response-parsing.service.ts
+++ b/src/app/core/data/facet-value-response-parsing.service.ts
@@ -4,7 +4,7 @@ import { ResponseParsingService } from './parsing.service';
 import { RestRequest } from './request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
-import { FacetValue } from '../../+search-page/search-service/facet-value.model';
+import { FacetValue } from '../../shared/search/facet-value.model';
 import { BaseResponseParsingService } from './base-response-parsing.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { GLOBAL_CONFIG } from '../../../config';
diff --git a/src/app/core/data/item-data.service.spec.ts b/src/app/core/data/item-data.service.spec.ts
index 36b8e6b3c5..6f2719f374 100644
--- a/src/app/core/data/item-data.service.spec.ts
+++ b/src/app/core/data/item-data.service.spec.ts
@@ -2,27 +2,18 @@ import { Store } from '@ngrx/store';
 import { cold, getTestScheduler } from 'jasmine-marbles';
 import { TestScheduler } from 'rxjs/testing';
 import { BrowseService } from '../browse/browse.service';
-import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { CoreState } from '../core.reducers';
 import { ItemDataService } from './item-data.service';
 import { RequestService } from './request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import {
-  DeleteRequest,
-  FindAllOptions,
-  GetRequest,
-  MappedCollectionsRequest,
-  PostRequest,
-  RestRequest
-} from './request.models';
+import { DeleteRequest, FindListOptions, PostRequest, RestRequest } from './request.models';
 import { ObjectCacheService } from '../cache/object-cache.service';
-import { Observable } from 'rxjs';
+import { Observable, of as observableOf } from 'rxjs';
 import { RestResponse } from '../cache/response.models';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { HttpClient } from '@angular/common/http';
 import { RequestEntry } from './request.reducer';
-import { of as observableOf } from 'rxjs';
 import { getMockRequestService } from '../../shared/mocks/mock-request.service';
 
 describe('ItemDataService', () => {
@@ -58,7 +49,7 @@ describe('ItemDataService', () => {
   } as HALEndpointService;
 
   const scopeID = '4af28e99-6a9c-4036-a199-e1b587046d39';
-  const options = Object.assign(new FindAllOptions(), {
+  const options = Object.assign(new FindListOptions(), {
     scopeID: scopeID,
     sort: {
       field: '',
@@ -185,7 +176,7 @@ describe('ItemDataService', () => {
     });
 
     it('should configure a DELETE request', () => {
-      result.subscribe(() => expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(DeleteRequest), undefined));
+      result.subscribe(() => expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(DeleteRequest)));
     });
   });
 
@@ -199,7 +190,7 @@ describe('ItemDataService', () => {
     });
 
     it('should configure a POST request', () => {
-      result.subscribe(() => expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PostRequest), undefined));
+      result.subscribe(() => expect(requestService.configure).toHaveBeenCalledWith(jasmine.any(PostRequest)));
     });
   });
 
diff --git a/src/app/core/data/item-data.service.ts b/src/app/core/data/item-data.service.ts
index 5c40e0312b..d4c7287d36 100644
--- a/src/app/core/data/item-data.service.ts
+++ b/src/app/core/data/item-data.service.ts
@@ -14,7 +14,7 @@ import { RequestService } from './request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import {
   DeleteRequest,
-  FindAllOptions,
+  FindListOptions,
   MappedCollectionsRequest,
   PatchRequest,
   PostRequest, PutRequest,
@@ -59,10 +59,10 @@ export class ItemDataService extends DataService<Item> {
   /**
    * Get the endpoint for browsing items
    *  (When options.sort.field is empty, the default field to browse by will be 'dc.date.issued')
-   * @param {FindAllOptions} options
+   * @param {FindListOptions} options
    * @returns {Observable<string>}
    */
-  public getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+  public getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
     let field = 'dc.date.issued';
     if (options.sort && options.sort.field) {
       field = options.sort.field;
@@ -247,4 +247,14 @@ export class ItemDataService extends DataService<Item> {
       map((request: RequestEntry) => request.response)
     );
   }
+
+  /**
+   * Get the endpoint for an item's bitstreams
+   * @param itemId
+   */
+  public getBitstreamsEndpoint(itemId: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      switchMap((url: string) => this.halService.getEndpoint('bitstreams', `${url}/${itemId}`))
+    );
+  }
 }
diff --git a/src/app/core/data/lookup-relation.service.spec.ts b/src/app/core/data/lookup-relation.service.spec.ts
new file mode 100644
index 0000000000..321fd8d218
--- /dev/null
+++ b/src/app/core/data/lookup-relation.service.spec.ts
@@ -0,0 +1,116 @@
+import { LookupRelationService } from './lookup-relation.service';
+import { ExternalSourceService } from './external-source.service';
+import { SearchService } from '../shared/search/search.service';
+import { createPaginatedList, createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { PaginatedList } from './paginated-list';
+import { PageInfo } from '../shared/page-info.model';
+import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
+import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
+import { SearchResult } from '../../shared/search/search-result.model';
+import { Item } from '../shared/item.model';
+import { skip, take } from 'rxjs/operators';
+import { ExternalSource } from '../shared/external-source.model';
+
+describe('LookupRelationService', () => {
+  let service: LookupRelationService;
+  let externalSourceService: ExternalSourceService;
+  let searchService: SearchService;
+
+  const totalExternal = 8;
+  const optionsWithQuery = new PaginatedSearchOptions({ query: 'test-query' });
+  const relationship = Object.assign(new RelationshipOptions(), {
+    filter: 'test-filter',
+    configuration: 'test-configuration'
+  });
+  const localResults = [
+    Object.assign(new SearchResult(), {
+      indexableObject: Object.assign(new Item(), {
+        uuid: 'test-item-uuid',
+        handle: 'test-item-handle'
+      })
+    })
+  ];
+  const externalSource = Object.assign(new ExternalSource(), {
+    id: 'orcidV2',
+    name: 'orcidV2',
+    hierarchical: false
+  });
+
+  function init() {
+    externalSourceService = jasmine.createSpyObj('externalSourceService', {
+      getExternalSourceEntries: createSuccessfulRemoteDataObject$(new PaginatedList(new PageInfo({ elementsPerPage: 1, totalElements: totalExternal, totalPages: totalExternal, currentPage: 1 }), [{}]))
+    });
+    searchService = jasmine.createSpyObj('searchService', {
+      search: createSuccessfulRemoteDataObject$(createPaginatedList(localResults))
+    });
+    service = new LookupRelationService(externalSourceService, searchService);
+  }
+
+  beforeEach(() => {
+    init();
+  });
+
+  describe('getLocalResults', () => {
+    let result;
+
+    beforeEach(() => {
+      result = service.getLocalResults(relationship, optionsWithQuery);
+    });
+
+    it('should return the local results', () => {
+      result.subscribe((resultsRD) => {
+        expect(resultsRD.payload.page).toBe(localResults);
+      });
+    });
+
+    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 }
+      ));
+    });
+  });
+
+  describe('getTotalLocalResults', () => {
+    let result;
+
+    beforeEach(() => {
+      result = service.getTotalLocalResults(relationship, optionsWithQuery);
+    });
+
+    it('should start with 0', () => {
+      result.pipe(take(1)).subscribe((amount) => {
+        expect(amount).toEqual(0)
+      });
+    });
+
+    it('should return the correct total amount', () => {
+      result.pipe(skip(1)).subscribe((amount) => {
+        expect(amount).toEqual(localResults.length)
+      });
+    });
+
+    it('should not set searchConfig', () => {
+      expect(service.searchConfig).toBeUndefined();
+    });
+  });
+
+  describe('getTotalExternalResults', () => {
+    let result;
+
+    beforeEach(() => {
+      result = service.getTotalExternalResults(externalSource, optionsWithQuery);
+    });
+
+    it('should start with 0', () => {
+      result.pipe(take(1)).subscribe((amount) => {
+        expect(amount).toEqual(0)
+      });
+    });
+
+    it('should return the correct total amount', () => {
+      result.pipe(skip(1)).subscribe((amount) => {
+        expect(amount).toEqual(totalExternal)
+      });
+    });
+  });
+});
diff --git a/src/app/core/data/lookup-relation.service.ts b/src/app/core/data/lookup-relation.service.ts
new file mode 100644
index 0000000000..ad977e42dc
--- /dev/null
+++ b/src/app/core/data/lookup-relation.service.ts
@@ -0,0 +1,94 @@
+import { ExternalSourceService } from './external-source.service';
+import { SearchService } from '../shared/search/search.service';
+import { concat, map, multicast, startWith, take, takeWhile } from 'rxjs/operators';
+import { PaginatedSearchOptions } from '../../shared/search/paginated-search-options.model';
+import { ReplaySubject } from 'rxjs/internal/ReplaySubject';
+import { RemoteData } from './remote-data';
+import { PaginatedList } from './paginated-list';
+import { SearchResult } from '../../shared/search/search-result.model';
+import { DSpaceObject } from '../shared/dspace-object.model';
+import { RelationshipOptions } from '../../shared/form/builder/models/relationship-options.model';
+import { Observable } from 'rxjs/internal/Observable';
+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';
+
+/**
+ * A service for retrieving local and external entries information during a relation lookup
+ */
+@Injectable()
+export class LookupRelationService {
+  /**
+   * The search config last used for retrieving local results
+   */
+  public searchConfig: PaginatedSearchOptions;
+
+  /**
+   * Pagination options for retrieving exactly one result
+   */
+  private singleResultOptions = Object.assign(new PaginationComponentOptions(), {
+    id: 'single-result-options',
+    pageSize: 1
+  });
+
+  constructor(protected externalSourceService: ExternalSourceService,
+              protected searchService: SearchService) {
+  }
+
+  /**
+   * Retrieve the available local entries for a relationship
+   * @param relationship    Relationship options
+   * @param searchOptions   Search options to filter results
+   * @param setSearchConfig Optionally choose if we should store the used search config in a local variable (defaults to true)
+   */
+  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 }
+    );
+    if (setSearchConfig) {
+      this.searchConfig = newConfig;
+    }
+    return this.searchService.search(newConfig).pipe(
+      /* Make sure to only listen to the first x results, until loading is finished */
+      /* TODO: in Rxjs 6.4.0 and up, we can replace this with takeWhile(predicate, true) - see https://stackoverflow.com/a/44644237 */
+      multicast(
+        () => new ReplaySubject(1),
+        (subject) => subject.pipe(
+          takeWhile((rd: RemoteData<PaginatedList<SearchResult<DSpaceObject>>>) => rd.isLoading),
+          concat(subject.pipe(take(1)))
+        )
+      ) as any
+    ) as Observable<RemoteData<PaginatedList<SearchResult<Item>>>>;
+  }
+
+  /**
+   * Calculate the total local entries available for the given relationship
+   * @param relationship  Relationship options
+   * @param searchOptions Search options to filter results
+   */
+  getTotalLocalResults(relationship: RelationshipOptions, searchOptions: PaginatedSearchOptions): Observable<number> {
+    return this.getLocalResults(relationship, Object.assign(new PaginatedSearchOptions({}), searchOptions, { pagination: this.singleResultOptions }), false).pipe(
+      getAllSucceededRemoteData(),
+      getRemoteDataPayload(),
+      map((results: PaginatedList<SearchResult<Item>>) => results.totalElements),
+      startWith(0)
+    );
+  }
+
+  /**
+   * Calculate the total external entries available for a given external source
+   * @param externalSource  External Source
+   * @param searchOptions   Search options to filter results
+   */
+  getTotalExternalResults(externalSource: ExternalSource, searchOptions: PaginatedSearchOptions): Observable<number> {
+    return this.externalSourceService.getExternalSourceEntries(externalSource.id, Object.assign(new PaginatedSearchOptions({}), searchOptions, { pagination: this.singleResultOptions })).pipe(
+      getAllSucceededRemoteData(),
+      getRemoteDataPayload(),
+      map((results: PaginatedList<ExternalSourceEntry>) => results.totalElements),
+      startWith(0)
+    );
+  }
+}
diff --git a/src/app/core/data/metadata-schema-data.service.ts b/src/app/core/data/metadata-schema-data.service.ts
index b15dd6865f..662eaa6c7c 100644
--- a/src/app/core/data/metadata-schema-data.service.ts
+++ b/src/app/core/data/metadata-schema-data.service.ts
@@ -7,7 +7,7 @@ import { CoreState } from '../core.reducers';
 import { DataService } from './data.service';
 import { RequestService } from './request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FindAllOptions } from './request.models';
+import { FindListOptions } from './request.models';
 import { ObjectCacheService } from '../cache/object-cache.service';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { HttpClient } from '@angular/common/http';
@@ -33,7 +33,7 @@ class DataServiceImpl extends DataService<MetadataSchema> {
     super();
   }
 
-  getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+  getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
     return this.halService.getEndpoint(linkPath);
   }
 }
diff --git a/src/app/core/data/mydspace-response-parsing.service.ts b/src/app/core/data/mydspace-response-parsing.service.ts
index a6945e27b4..bd5d5b1083 100644
--- a/src/app/core/data/mydspace-response-parsing.service.ts
+++ b/src/app/core/data/mydspace-response-parsing.service.ts
@@ -6,7 +6,7 @@ import { RestRequest } from './request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
 import { hasValue } from '../../shared/empty.util';
-import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
+import { SearchQueryResponse } from '../../shared/search/search-query-response.model';
 import { MetadataMap, MetadataValue } from '../shared/metadata.models';
 
 @Injectable()
diff --git a/src/app/core/data/paginated-list.ts b/src/app/core/data/paginated-list.ts
index e1c1b22569..b9de67a34d 100644
--- a/src/app/core/data/paginated-list.ts
+++ b/src/app/core/data/paginated-list.ts
@@ -3,7 +3,7 @@ import { hasValue } from '../../shared/empty.util';
 
 export class PaginatedList<T> {
 
-  constructor(private pageInfo: PageInfo,
+  constructor(public pageInfo: PageInfo,
               public page: T[]) {
   }
 
diff --git a/src/app/core/data/relationship-type.service.spec.ts b/src/app/core/data/relationship-type.service.spec.ts
new file mode 100644
index 0000000000..118baf8738
--- /dev/null
+++ b/src/app/core/data/relationship-type.service.spec.ts
@@ -0,0 +1,99 @@
+import { RequestService } from './request.service';
+import { HALEndpointServiceStub } from '../../shared/testing/hal-endpoint-service-stub';
+import { getMockRemoteDataBuildService } from '../../shared/mocks/mock-remote-data-build.service';
+import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import { getMockRequestService } from '../../shared/mocks/mock-request.service';
+import { PaginatedList } from './paginated-list';
+import { PageInfo } from '../shared/page-info.model';
+import { createSuccessfulRemoteDataObject, createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { RelationshipTypeService } from './relationship-type.service';
+import { of as observableOf } from 'rxjs';
+import { ItemType } from '../shared/item-relationships/item-type.model';
+
+describe('RelationshipTypeService', () => {
+  let service: RelationshipTypeService;
+  let requestService: RequestService;
+  let restEndpointURL;
+  let halService: any;
+  let publicationTypeString;
+  let personTypeString;
+  let orgUnitTypeString;
+  let publicationType;
+  let personType;
+  let orgUnitType;
+
+  let relationshipType1;
+  let relationshipType2;
+
+  let buildList;
+  let rdbService;
+
+  function init() {
+    restEndpointURL = 'https://rest.api/relationshiptypes';
+    halService = new HALEndpointServiceStub(restEndpointURL);
+    publicationTypeString = 'Publication';
+    personTypeString = 'Person';
+    orgUnitTypeString = 'OrgUnit';
+    publicationType = Object.assign(new ItemType(), {label: publicationTypeString});
+    personType = Object.assign(new ItemType(), {label: personTypeString});
+    orgUnitType = Object.assign(new ItemType(), {label: orgUnitTypeString});
+
+    relationshipType1 = Object.assign(new RelationshipType(), {
+      id: '1',
+      uuid: '1',
+      leftwardType: 'isAuthorOfPublication',
+      rightwardType: 'isPublicationOfAuthor',
+      leftType: createSuccessfulRemoteDataObject$(publicationType),
+      rightType: createSuccessfulRemoteDataObject$(personType)
+    });
+
+    relationshipType2 = Object.assign(new RelationshipType(), {
+      id: '2',
+      uuid: '2',
+      leftwardType: 'isOrgUnitOfPublication',
+      rightwardType: 'isPublicationOfOrgUnit',
+      leftType: createSuccessfulRemoteDataObject$(publicationType),
+      rightType: createSuccessfulRemoteDataObject$(orgUnitType)
+    });
+
+    buildList = createSuccessfulRemoteDataObject(new PaginatedList(new PageInfo(), [relationshipType1, relationshipType2]));
+    rdbService = getMockRemoteDataBuildService(undefined, observableOf(buildList));
+
+  }
+  function initTestService() {
+    return new RelationshipTypeService(
+      requestService,
+      halService,
+      rdbService
+    );
+  }
+
+  beforeEach(() => {
+    init();
+    requestService = getMockRequestService();
+    service = initTestService();
+  });
+
+  describe('getAllRelationshipTypes', () => {
+
+    it('should return all relationshipTypes', (done) => {
+      const expected = service.getAllRelationshipTypes({});
+      expected.subscribe((e) => {
+        expect(e).toBe(buildList);
+        done();
+      })
+    });
+  });
+
+  describe('getRelationshipTypeByLabelAndTypes', () => {
+
+    it('should return the type filtered by label and type strings', (done) => {
+      const expected = service.getRelationshipTypeByLabelAndTypes(relationshipType1.leftwardType, publicationTypeString, personTypeString);
+      expected.subscribe((e) => {
+        expect(e).toBe(relationshipType1);
+        done();
+      })
+    });
+  });
+
+});
diff --git a/src/app/core/data/relationship-type.service.ts b/src/app/core/data/relationship-type.service.ts
new file mode 100644
index 0000000000..7978373b08
--- /dev/null
+++ b/src/app/core/data/relationship-type.service.ts
@@ -0,0 +1,81 @@
+import { Injectable } from '@angular/core';
+import { RequestService } from './request.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { filter, find, map, switchMap } from 'rxjs/operators';
+import { configureRequest, getSucceededRemoteData } from '../shared/operators';
+import { Observable } from 'rxjs/internal/Observable';
+import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
+import { RemoteData } from './remote-data';
+import { PaginatedList } from './paginated-list';
+import { combineLatest as observableCombineLatest } from 'rxjs';
+import { ItemType } from '../shared/item-relationships/item-type.model';
+import { isNotUndefined } from '../../shared/empty.util';
+import { FindListOptions, FindListRequest } from './request.models';
+
+/**
+ * The service handling all relationship requests
+ */
+@Injectable()
+export class RelationshipTypeService {
+  protected linkPath = 'relationshiptypes';
+
+  constructor(protected requestService: RequestService,
+              protected halService: HALEndpointService,
+              protected rdbService: RemoteDataBuildService) {
+  }
+
+  /**
+   * Get the endpoint for a relationship type by ID
+   * @param id
+   */
+  getRelationshipTypeEndpoint(id: number) {
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      map((href: string) => `${href}/${id}`)
+    );
+  }
+
+  getAllRelationshipTypes(options: FindListOptions): Observable<RemoteData<PaginatedList<RelationshipType>>> {
+    const link$ = this.halService.getEndpoint(this.linkPath);
+    return link$
+      .pipe(
+        map((endpointURL: string) => new FindListRequest(this.requestService.generateRequestId(), endpointURL, options)),
+        configureRequest(this.requestService),
+        switchMap(() => this.rdbService.buildList(link$))
+      ) as Observable<RemoteData<PaginatedList<RelationshipType>>>;
+  }
+
+  /**
+   * Get the RelationshipType for a relationship type by label
+   * @param label
+   */
+  getRelationshipTypeByLabelAndTypes(label: string, firstType: string, secondType: string): Observable<RelationshipType> {
+    return this.getAllRelationshipTypes({ currentPage: 1, elementsPerPage: Number.MAX_VALUE })
+      .pipe(
+        getSucceededRemoteData(),
+        /* Flatten the page so we can treat it like an observable */
+        switchMap((typeListRD: RemoteData<PaginatedList<RelationshipType>>) => typeListRD.payload.page),
+        switchMap((type: RelationshipType) => {
+          if (type.leftwardType === label) {
+            return this.checkType(type, firstType, secondType);
+          } else if (type.rightwardType === label) {
+            return this.checkType(type, secondType, firstType);
+          } else {
+            return [];
+          }
+        }),
+      );
+  }
+
+  // Check if relationship type matches the given types
+  // returns a void observable if there's not match
+  // returns an observable that emits the relationship type when there is a match
+  private checkType(type: RelationshipType, firstType: string, secondType: string): Observable<RelationshipType> {
+    const entityTypes = observableCombineLatest(type.leftType.pipe(getSucceededRemoteData()), type.rightType.pipe(getSucceededRemoteData()));
+    return entityTypes.pipe(
+      find(([leftTypeRD, rightTypeRD]: [RemoteData<ItemType>, RemoteData<ItemType>]) => leftTypeRD.payload.label === firstType && rightTypeRD.payload.label === secondType),
+      filter((types) => isNotUndefined(types)),
+      map(() => type)
+    );
+  }
+}
diff --git a/src/app/core/data/relationship.service.spec.ts b/src/app/core/data/relationship.service.spec.ts
index 4091759386..9287935f59 100644
--- a/src/app/core/data/relationship.service.spec.ts
+++ b/src/app/core/data/relationship.service.spec.ts
@@ -71,12 +71,14 @@ describe('RelationshipService', () => {
   const rdbService = getMockRemoteDataBuildService(undefined, buildList$);
   const objectCache = Object.assign({
     /* tslint:disable:no-empty */
-    remove: () => {}
+    remove: () => {},
+    hasBySelfLinkObservable: () => observableOf(false)
     /* tslint:enable:no-empty */
   }) as ObjectCacheService;
 
   const itemService = jasmine.createSpyObj('itemService', {
-    findById: (uuid) => new RemoteData(false, false, true, undefined, relatedItems.filter((relatedItem) => relatedItem.id === uuid)[0])
+    findById: (uuid) => new RemoteData(false, false, true, undefined, relatedItems.find((relatedItem) => relatedItem.id === uuid)),
+    findByHref: createSuccessfulRemoteDataObject$(relatedItems[0])
   });
 
   function initTestService() {
@@ -90,6 +92,7 @@ describe('RelationshipService', () => {
       objectCache,
       null,
       null,
+      null,
       null
     );
   }
@@ -120,8 +123,8 @@ describe('RelationshipService', () => {
     it('should clear the related items their cache', () => {
       expect(objectCache.remove).toHaveBeenCalledWith(relatedItem1.self);
       expect(objectCache.remove).toHaveBeenCalledWith(item.self);
-      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(relatedItem1.self);
-      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(item.self);
+      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(relatedItem1.uuid);
+      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(item.uuid);
     });
   });
 
@@ -133,14 +136,6 @@ describe('RelationshipService', () => {
     });
   });
 
-  describe('getItemRelationshipLabels', () => {
-    it('should return the correct labels', () => {
-      service.getItemRelationshipLabels(item).subscribe((result) => {
-        expect(result).toEqual([relationshipType.rightwardType]);
-      });
-    });
-  });
-
   describe('getRelatedItems', () => {
     it('should return the related items', () => {
       service.getRelatedItems(item).subscribe((result) => {
diff --git a/src/app/core/data/relationship.service.ts b/src/app/core/data/relationship.service.ts
index c466bd15af..d6993ebcee 100644
--- a/src/app/core/data/relationship.service.ts
+++ b/src/app/core/data/relationship.service.ts
@@ -1,39 +1,45 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { RequestService } from './request.service';
-import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { MemoizedSelector, select, Store } from '@ngrx/store';
+import { combineLatest, combineLatest as observableCombineLatest } from 'rxjs';
+import { distinctUntilChanged, filter, map, mergeMap, startWith, switchMap, take, tap } from 'rxjs/operators';
+import { compareArraysUsingIds, paginatedRelationsToItems, 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 { ReorderableRelationship } from '../../shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
+import { RemoveNameVariantAction, 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 { NotificationsService } from '../../shared/notifications/notifications.service';
+import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
-import { hasValue, hasValueOperator, isNotEmptyOperator } from '../../shared/empty.util';
-import { distinctUntilChanged, filter, flatMap, map, switchMap, take, tap } from 'rxjs/operators';
-import {
-  configureRequest,
-  filterSuccessfulResponses,
-  getRemoteDataPayload, getResponseFromEntry,
-  getSucceededRemoteData
-} from '../shared/operators';
-import { DeleteRequest, FindAllOptions, RestRequest } from './request.models';
-import { Observable } from 'rxjs/internal/Observable';
+import { configureRequest, getRemoteDataPayload, getResponseFromEntry, getSucceededRemoteData } from '../shared/operators';
+import { SearchParam } from '../cache/models/search-param.model';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { DeleteRequest, FindListOptions, PostRequest, RestRequest } from './request.models';
 import { RestResponse } from '../cache/response.models';
-import { Item } from '../shared/item.model';
-import { Relationship } from '../shared/item-relationships/relationship.model';
+import { CoreState } from '../core.reducers';
+import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RelationshipType } from '../shared/item-relationships/relationship-type.model';
-import { RemoteData } from './remote-data';
-import { combineLatest as observableCombineLatest } from 'rxjs/internal/observable/combineLatest';
-import { zip as observableZip } from 'rxjs';
+import { RemoteData, RemoteDataState } from './remote-data';
 import { PaginatedList } from './paginated-list';
 import { ItemDataService } from './item-data.service';
-import {
-  compareArraysUsingIds, filterRelationsByTypeLabel, paginatedRelationsToItems,
-  relationsToItems
-} from '../../+item-page/simple/item-types/shared/item-relationships-utils';
-import { ObjectCacheService } from '../cache/object-cache.service';
+import { Relationship } from '../shared/item-relationships/relationship.model';
+import { Item } from '../shared/item.model';
 import { DataService } from './data.service';
-import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
-import { Store } from '@ngrx/store';
-import { CoreState } from '../core.reducers';
-import { NotificationsService } from '../../shared/notifications/notifications.service';
-import { HttpClient } from '@angular/common/http';
 import { DefaultChangeAnalyzer } from './default-change-analyzer.service';
-import { SearchParam } from '../cache/models/search-param.model';
+import { RequestService } from './request.service';
+import { Observable } from 'rxjs/internal/Observable';
+
+const relationshipListsStateSelector = (state: AppState) => state.relationshipLists;
+
+const relationshipListStateSelector = (listID: string): MemoizedSelector<AppState, NameVariantListState> => {
+  return keySelector<NameVariantListState>(listID, relationshipListsStateSelector);
+};
+
+const relationshipStateSelector = (listID: string, itemID: string): MemoizedSelector<AppState, string> => {
+  return keySelector<string>(itemID, relationshipListStateSelector(listID));
+};
 
 /**
  * The service handling all relationship requests
@@ -52,11 +58,12 @@ export class RelationshipService extends DataService<Relationship> {
               protected objectCache: ObjectCacheService,
               protected notificationsService: NotificationsService,
               protected http: HttpClient,
-              protected comparator: DefaultChangeAnalyzer<Relationship>) {
+              protected comparator: DefaultChangeAnalyzer<Relationship>,
+              protected appStore: Store<AppState>) {
     super();
   }
 
-  getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+  getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
     return this.halService.getEndpoint(linkPath);
   }
 
@@ -65,76 +72,94 @@ export class RelationshipService extends DataService<Relationship> {
    * @param uuid
    */
   getRelationshipEndpoint(uuid: string) {
-    return this.halService.getEndpoint(this.linkPath).pipe(
+    return this.getBrowseEndpoint().pipe(
       map((href: string) => `${href}/${uuid}`)
     );
   }
 
-  /**
-   * Find a relationship by its UUID
-   * @param uuid
-   */
-  findById(uuid: string): Observable<RemoteData<Relationship>> {
-    const href$ = this.getRelationshipEndpoint(uuid);
-    return this.rdbService.buildSingle<Relationship>(href$);
-  }
-
   /**
    * Send a delete request for a relationship by ID
-   * @param uuid
+   * @param id
    */
-  deleteRelationship(uuid: string): Observable<RestResponse> {
-    return this.getRelationshipEndpoint(uuid).pipe(
+  deleteRelationship(id: string): Observable<RestResponse> {
+    return this.getRelationshipEndpoint(id).pipe(
       isNotEmptyOperator(),
-      distinctUntilChanged(),
+      take(1),
       map((endpointURL: string) => new DeleteRequest(this.requestService.generateRequestId(), endpointURL)),
       configureRequest(this.requestService),
       switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)),
       getResponseFromEntry(),
-      tap(() => this.clearRelatedCache(uuid))
+      tap(() => this.removeRelationshipItemsFromCacheByRelationship(id))
     );
   }
 
   /**
-   * Get a combined observable containing an array of all relationships in an item, as well as an array of the relationships their types
-   * This is used for easier access of a relationship's type because they exist as observables
-   * @param item
+   * Method to create a new relationship
+   * @param typeId The identifier of the relationship type
+   * @param item1 The first item of the relationship
+   * @param item2 The second item of the relationship
+   * @param leftwardValue The leftward value of the relationship
+   * @param rightwardValue The rightward value of the relationship
    */
-  getItemResolvedRelsAndTypes(item: Item): Observable<[Relationship[], RelationshipType[]]> {
-    return observableCombineLatest(
-      this.getItemRelationshipsArray(item),
-      this.getItemRelationshipTypesArray(item)
-    );
+  addRelationship(typeId: string, item1: Item, item2: Item, leftwardValue?: string, rightwardValue?: string): Observable<RestResponse> {
+    const options: HttpOptions = Object.create({});
+    let headers = new HttpHeaders();
+    headers = headers.append('Content-Type', 'text/uri-list');
+    options.headers = headers;
+    return this.halService.getEndpoint(this.linkPath).pipe(
+      isNotEmptyOperator(),
+      take(1),
+      map((endpointUrl: string) => `${endpointUrl}?relationshipType=${typeId}`),
+      map((endpointUrl: string) => isNotEmpty(leftwardValue) ? `${endpointUrl}&leftwardValue=${leftwardValue}` : endpointUrl),
+      map((endpointUrl: string) => isNotEmpty(rightwardValue) ? `${endpointUrl}&rightwardValue=${rightwardValue}` : endpointUrl),
+      map((endpointURL: string) => new PostRequest(this.requestService.generateRequestId(), endpointURL, `${item1.self} \n ${item2.self}`, options)),
+      configureRequest(this.requestService),
+      switchMap((restRequest: RestRequest) => this.requestService.getByUUID(restRequest.uuid)),
+      getResponseFromEntry(),
+      tap(() => this.removeRelationshipItemsFromCache(item1)),
+      tap(() => this.removeRelationshipItemsFromCache(item2))
+    ) as Observable<RestResponse>;
   }
 
   /**
-   * Get a combined observable containing an array of all the item's relationship's left- and right-side items, as well as an array of the relationships their types
-   * This is used for easier access of a relationship's type and left and right items because they exist as observables
-   * @param item
+   * Method to remove two items of a relationship from the cache using the identifier of the relationship
+   * @param relationshipId The identifier of the relationship
    */
-  getItemResolvedRelatedItemsAndTypes(item: Item): Observable<[Item[], Item[], RelationshipType[]]> {
-    return observableCombineLatest(
-      this.getItemLeftRelatedItemArray(item),
-      this.getItemRightRelatedItemArray(item),
-      this.getItemRelationshipTypesArray(item)
-    );
+  private removeRelationshipItemsFromCacheByRelationship(relationshipId: string) {
+    this.findById(relationshipId).pipe(
+      getSucceededRemoteData(),
+      getRemoteDataPayload(),
+      switchMap((rel: Relationship) => combineLatest(
+        rel.leftItem.pipe(getSucceededRemoteData(), getRemoteDataPayload()),
+        rel.rightItem.pipe(getSucceededRemoteData(), getRemoteDataPayload())
+        )
+      ),
+      take(1)
+    ).subscribe(([item1, item2]) => {
+      this.removeRelationshipItemsFromCache(item1);
+      this.removeRelationshipItemsFromCache(item2);
+    })
   }
 
   /**
-   * Get a combined observable containing an array of all the item's relationship's left- and right-side items, as well as an array of the relationships themselves
-   * This is used for easier access of the relationship and their left and right items because they exist as observables
-   * @param item
+   * Method to remove an item that's part of a relationship from the cache
+   * @param item The item to remove from the cache
    */
-  getItemResolvedRelatedItemsAndRelationships(item: Item): Observable<[Item[], Item[], Relationship[]]> {
-    return observableCombineLatest(
-      this.getItemLeftRelatedItemArray(item),
-      this.getItemRightRelatedItemArray(item),
-      this.getItemRelationshipsArray(item)
-    );
+  private removeRelationshipItemsFromCache(item) {
+    this.objectCache.remove(item.self);
+    this.requestService.removeByHrefSubstring(item.uuid);
+    combineLatest(
+      this.objectCache.hasBySelfLinkObservable(item.self),
+      this.requestService.hasByHrefObservable(item.uuid)
+    ).pipe(
+      filter(([existsInOC, existsInRC]) => !existsInOC && !existsInRC),
+      take(1),
+      switchMap(() => this.itemService.findByHref(item.self).pipe(take(1)))
+    ).subscribe();
   }
 
   /**
-   * Get an item their relationships in the form of an array
+   * Get an item its relationships in the form of an array
    * @param item
    */
   getItemRelationshipsArray(item: Item): Observable<Relationship[]> {
@@ -148,67 +173,33 @@ export class RelationshipService extends DataService<Relationship> {
   }
 
   /**
-   * Get an item their relationship types in the form of an array
-   * @param item
-   */
-  getItemRelationshipTypesArray(item: Item): Observable<RelationshipType[]> {
-    return this.getItemRelationshipsArray(item).pipe(
-      flatMap((rels: Relationship[]) =>
-        observableZip(...rels.map((rel: Relationship) => rel.relationshipType)).pipe(
-          map(([...arr]: Array<RemoteData<RelationshipType>>) => arr.map((d: RemoteData<RelationshipType>) => d.payload).filter((type) => hasValue(type))),
-          filter((arr) => arr.length === rels.length)
-        )
-      ),
-      distinctUntilChanged(compareArraysUsingIds())
-    );
-  }
-
-  /**
-   * Get an item his relationship's left-side related items in the form of an array
-   * @param item
-   */
-  getItemLeftRelatedItemArray(item: Item): Observable<Item[]> {
-    return this.getItemRelationshipsArray(item).pipe(
-      flatMap((rels: Relationship[]) => observableZip(...rels.map((rel: Relationship) => rel.leftItem)).pipe(
-        map(([...arr]: Array<RemoteData<Item>>) => arr.map((rd: RemoteData<Item>) => rd.payload).filter((i) => hasValue(i))),
-        filter((arr) => arr.length === rels.length)
-      )),
-      distinctUntilChanged(compareArraysUsingIds())
-    );
-  }
-
-  /**
-   * Get an item his relationship's right-side related items in the form of an array
-   * @param item
-   */
-  getItemRightRelatedItemArray(item: Item): Observable<Item[]> {
-    return this.getItemRelationshipsArray(item).pipe(
-      flatMap((rels: Relationship[]) => observableZip(...rels.map((rel: Relationship) => rel.rightItem)).pipe(
-        map(([...arr]: Array<RemoteData<Item>>) => arr.map((rd: RemoteData<Item>) => rd.payload).filter((i) => hasValue(i))),
-        filter((arr) => arr.length === rels.length)
-      )),
-      distinctUntilChanged(compareArraysUsingIds())
-    );
-  }
-
-  /**
-   * Get an array of an item their unique relationship type's labels
+   * Get an array of the labels of an item’s unique relationship types
    * The array doesn't contain any duplicate labels
    * @param item
    */
-  getItemRelationshipLabels(item: Item): Observable<string[]> {
-    return this.getItemResolvedRelatedItemsAndTypes(item).pipe(
-      map(([leftItems, rightItems, relTypesCurrentPage]) => {
-        return relTypesCurrentPage.map((type, index) => {
-          if (leftItems[index].uuid === item.uuid) {
-            return type.leftwardType;
-          } else {
-            return type.rightwardType;
-          }
-        });
-      }),
+  getRelationshipTypeLabelsByItem(item: Item): Observable<string[]> {
+    return this.getItemRelationshipsArray(item).pipe(
+      switchMap((relationships: Relationship[]) => observableCombineLatest(relationships.map((relationship: Relationship) => this.getRelationshipTypeLabelByRelationshipAndItem(relationship, item)))),
       map((labels: string[]) => Array.from(new Set(labels)))
-    )
+    );
+  }
+
+  private getRelationshipTypeLabelByRelationshipAndItem(relationship: Relationship, item: Item): Observable<string> {
+    return relationship.leftItem.pipe(
+      getSucceededRemoteData(),
+      map((itemRD: RemoteData<Item>) => itemRD.payload),
+      switchMap((otherItem: Item) => relationship.relationshipType.pipe(
+        getSucceededRemoteData(),
+        map((relationshipTypeRD) => relationshipTypeRD.payload),
+        map((relationshipType: RelationshipType) => {
+          if (otherItem.uuid === item.uuid) {
+            return relationshipType.leftwardType;
+          } else {
+            return relationshipType.rightwardType;
+          }
+        })
+        )
+      ))
   }
 
   /**
@@ -228,7 +219,7 @@ export class RelationshipService extends DataService<Relationship> {
    * @param label
    * @param options
    */
-  getRelatedItemsByLabel(item: Item, label: string, options?: FindAllOptions): Observable<RemoteData<PaginatedList<Item>>> {
+  getRelatedItemsByLabel(item: Item, label: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Item>>> {
     return this.getItemRelationshipsByLabel(item, label, options).pipe(paginatedRelationsToItems(item.uuid));
   }
 
@@ -239,35 +230,191 @@ export class RelationshipService extends DataService<Relationship> {
    * @param label
    * @param options
    */
-  getItemRelationshipsByLabel(item: Item, label: string, options?: FindAllOptions): Observable<RemoteData<PaginatedList<Relationship>>> {
-    let findAllOptions = new FindAllOptions();
+  getItemRelationshipsByLabel(item: Item, label: string, options?: FindListOptions): Observable<RemoteData<PaginatedList<Relationship>>> {
+    let findListOptions = new FindListOptions();
     if (options) {
-      findAllOptions = Object.assign(new FindAllOptions(), options);
+      findListOptions = Object.assign(new FindListOptions(), options);
     }
-    const searchParams = [ new SearchParam('label', label), new SearchParam('dso', item.id) ];
-    if (findAllOptions.searchParams) {
-      findAllOptions.searchParams = [...findAllOptions.searchParams, ...searchParams];
+    const searchParams = [new SearchParam('label', label), new SearchParam('dso', item.id)];
+    if (findListOptions.searchParams) {
+      findListOptions.searchParams = [...findListOptions.searchParams, ...searchParams];
     } else {
-      findAllOptions.searchParams = searchParams;
+      findListOptions.searchParams = searchParams;
     }
-    return this.searchBy('byLabel', findAllOptions);
+    return this.searchBy('byLabel', findListOptions);
   }
 
   /**
-   * Clear object and request caches of the items related to a relationship (left and right items)
-   * @param uuid
+   * Method for fetching an item's relationships, but filtered by related item IDs (essentially performing a reverse lookup)
+   * Only relationships where leftItem or rightItem's ID is present in the list provided will be returned
+   * @param item
+   * @param uuids
    */
-  clearRelatedCache(uuid: string) {
-    this.findById(uuid).pipe(
+  getRelationshipsByRelatedItemIds(item: Item, uuids: string[]): Observable<Relationship[]> {
+    return this.getItemRelationshipsArray(item).pipe(
+      switchMap((relationships: Relationship[]) => {
+        return observableCombineLatest(...relationships.map((relationship: Relationship) => {
+          const isLeftItem$ = this.isItemInUUIDArray(relationship.leftItem, uuids);
+          const isRightItem$ = this.isItemInUUIDArray(relationship.rightItem, uuids);
+          return observableCombineLatest(isLeftItem$, isRightItem$).pipe(
+            filter(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
+            map(() => relationship),
+            startWith(undefined)
+          );
+        }))
+      }),
+      map((relationships: Relationship[]) => relationships.filter(((relationship) => hasValue(relationship)))),
+    )
+  }
+
+  private isItemInUUIDArray(itemRD$: Observable<RemoteData<Item>>, uuids: string[]) {
+    return itemRD$.pipe(
       getSucceededRemoteData(),
-      flatMap((rd: RemoteData<Relationship>) => observableCombineLatest(rd.payload.leftItem.pipe(getSucceededRemoteData()), rd.payload.rightItem.pipe(getSucceededRemoteData()))),
-      take(1)
-    ).subscribe(([leftItem, rightItem]) => {
-      this.objectCache.remove(leftItem.payload.self);
-      this.objectCache.remove(rightItem.payload.self);
-      this.requestService.removeByHrefSubstring(leftItem.payload.self);
-      this.requestService.removeByHrefSubstring(rightItem.payload.self);
+      map((itemRD: RemoteData<Item>) => itemRD.payload),
+      map((item: Item) => uuids.includes(item.uuid))
+    );
+  }
+
+  /**
+   * Method to retrieve a relationship based on two items and a relationship type label
+   * @param item1 The first item in the relationship
+   * @param item2 The second item in the relationship
+   * @param label The rightward or leftward type of the relationship
+   */
+  getRelationshipByItemsAndLabel(item1: Item, item2: Item, label: string): Observable<Relationship> {
+    return this.getItemRelationshipsByLabel(item1, label)
+      .pipe(
+        getSucceededRemoteData(),
+        isNotEmptyOperator(),
+        map((relationshipListRD: RemoteData<PaginatedList<Relationship>>) => relationshipListRD.payload.page),
+        mergeMap((relationships: Relationship[]) => {
+          return observableCombineLatest(...relationships.map((relationship: Relationship) => {
+            return observableCombineLatest(
+              this.isItemMatchWithItemRD(relationship.leftItem, item2),
+              this.isItemMatchWithItemRD(relationship.rightItem, item2)
+            ).pipe(
+              map(([isLeftItem, isRightItem]) => isLeftItem || isRightItem),
+              map((isMatch) => isMatch ? relationship : undefined)
+            );
+          }))
+        }),
+        map((relationships: Relationship[]) => relationships.find(((relationship) => hasValue(relationship))))
+      )
+  }
+
+  private isItemMatchWithItemRD(itemRD$: Observable<RemoteData<Item>>, itemCheck: Item): Observable<boolean> {
+    return itemRD$.pipe(
+      getSucceededRemoteData(),
+      map((itemRD: RemoteData<Item>) => itemRD.payload),
+      map((item: Item) => item.uuid === itemCheck.uuid)
+    );
+  }
+
+  /**
+   * Method to set the name variant for specific list and item
+   * @param listID The list for which to save the name variant
+   * @param itemID The item ID for which to save the name variant
+   * @param nameVariant The name variant to save
+   */
+  public setNameVariant(listID: string, itemID: string, nameVariant: string) {
+    this.appStore.dispatch(new SetNameVariantAction(listID, itemID, nameVariant));
+  }
+
+  /**
+   * Method to retrieve the name variant for a specific list and item
+   * @param listID The list for which to retrieve the name variant
+   * @param itemID The item ID for which to retrieve the name variant
+   */
+  public getNameVariant(listID: string, itemID: string): Observable<string> {
+    return this.appStore.pipe(
+      select(relationshipStateSelector(listID, itemID))
+    );
+  }
+
+  /**
+   * Method to remove the name variant for specific list and item
+   * @param listID The list for which to remove the name variant
+   * @param itemID The item ID for which to remove the name variant
+   */
+  public removeNameVariant(listID: string, itemID: string) {
+    this.appStore.dispatch(new RemoveNameVariantAction(listID, itemID));
+  }
+
+  /**
+   * Method to retrieve all name variants for a single list
+   * @param listID The id of the list
+   */
+  public getNameVariantsByListID(listID: string) {
+    return this.appStore.pipe(select(relationshipListStateSelector(listID)));
+  }
+
+  /**
+   * Method to update the name variant on the server
+   * @param item1 The first item of the relationship
+   * @param item2 The second item of the relationship
+   * @param relationshipLabel The leftward or rightward type of the relationship
+   * @param nameVariant The name variant to set for the matching relationship
+   */
+  public updateNameVariant(item1: Item, item2: Item, relationshipLabel: string, nameVariant: string): Observable<RemoteData<Relationship>> {
+    const update$: Observable<RemoteData<Relationship>> = this.getRelationshipByItemsAndLabel(item1, item2, relationshipLabel)
+      .pipe(
+        switchMap((relation: Relationship) =>
+          relation.relationshipType.pipe(
+            getSucceededRemoteData(),
+            getRemoteDataPayload(),
+            map((type) => {
+              return { relation, type }
+            })
+          )
+        ),
+        switchMap((relationshipAndType: { relation: Relationship, type: RelationshipType }) => {
+          const { relation, type } = relationshipAndType;
+          let updatedRelationship;
+          if (relationshipLabel === type.leftwardType) {
+            updatedRelationship = Object.assign(new Relationship(), relation, { rightwardValue: nameVariant });
+          } else {
+            updatedRelationship = Object.assign(new Relationship(), relation, { leftwardValue: nameVariant });
+          }
+          return this.update(updatedRelationship);
+        }),
+      );
+
+    update$.pipe(
+      filter((relationshipRD: RemoteData<Relationship>) => relationshipRD.state === RemoteDataState.RequestPending),
+      take(1),
+    ).subscribe(() => {
+      this.removeRelationshipItemsFromCache(item1);
+      this.removeRelationshipItemsFromCache(item2);
     });
+
+    return update$
+  }
+
+  /**
+   * Method to update the the right or left place of a relationship
+   * The useLeftItem field in the reorderable relationship determines which place should be updated
+   * @param reoRel
+   */
+  public updatePlace(reoRel: ReorderableRelationship): Observable<RemoteData<Relationship>> {
+    let updatedRelationship;
+    if (reoRel.useLeftItem) {
+      updatedRelationship = Object.assign(new Relationship(), reoRel.relationship, { rightPlace: reoRel.newIndex });
+    } else {
+      updatedRelationship = Object.assign(new Relationship(), reoRel.relationship, { leftPlace: reoRel.newIndex });
+    }
+
+    const update$ = this.update(updatedRelationship);
+
+    update$.pipe(
+      filter((relationshipRD: RemoteData<Relationship>) => relationshipRD.state === RemoteDataState.ResponsePending),
+      take(1),
+    ).subscribe((relationshipRD: RemoteData<Relationship>) => {
+      if (relationshipRD.state === RemoteDataState.ResponsePending) {
+        this.removeRelationshipItemsFromCacheByRelationship(reoRel.relationship.id);
+      }
+    });
+
+    return update$;
   }
 
 }
diff --git a/src/app/core/data/remote-data.ts b/src/app/core/data/remote-data.ts
index 2aa3227d12..3be9248907 100644
--- a/src/app/core/data/remote-data.ts
+++ b/src/app/core/data/remote-data.ts
@@ -13,11 +13,11 @@ export enum RemoteDataState {
  */
 export class RemoteData<T> {
   constructor(
-    private requestPending: boolean,
-    private responsePending: boolean,
-    private isSuccessful: boolean,
-    public error: RemoteDataError,
-    public payload: T
+    private requestPending?: boolean,
+    private responsePending?: boolean,
+    private isSuccessful?: boolean,
+    public error?: RemoteDataError,
+    public payload?: T
   ) {
   }
 
diff --git a/src/app/core/data/request.models.ts b/src/app/core/data/request.models.ts
index a7d11089df..ca864f99de 100644
--- a/src/app/core/data/request.models.ts
+++ b/src/app/core/data/request.models.ts
@@ -138,7 +138,7 @@ export class FindByIDRequest extends GetRequest {
   }
 }
 
-export class FindAllOptions {
+export class FindListOptions {
   scopeID?: string;
   elementsPerPage?: number;
   currentPage?: number;
@@ -147,11 +147,11 @@ export class FindAllOptions {
   startsWith?: string;
 }
 
-export class FindAllRequest extends GetRequest {
+export class FindListRequest extends GetRequest {
   constructor(
     uuid: string,
     href: string,
-    public body?: FindAllOptions,
+    public body?: FindListOptions,
   ) {
     super(uuid, href);
   }
diff --git a/src/app/core/data/request.service.spec.ts b/src/app/core/data/request.service.spec.ts
index 5807666d66..01560380c2 100644
--- a/src/app/core/data/request.service.spec.ts
+++ b/src/app/core/data/request.service.spec.ts
@@ -21,6 +21,7 @@ import {
 } from './request.models';
 import { RequestService } from './request.service';
 import { TestScheduler } from 'rxjs/testing';
+import { RequestEntry } from './request.reducer';
 
 describe('RequestService', () => {
   let scheduler: TestScheduler;
@@ -107,7 +108,7 @@ describe('RequestService', () => {
       beforeEach(() => {
         spyOn(service, 'getByHref').and.returnValue(observableOf({
           completed: false
-        }))
+        } as RequestEntry))
       });
 
       it('should return true', () => {
@@ -122,7 +123,7 @@ describe('RequestService', () => {
       beforeEach(() => {
         spyOn(service, 'getByHref').and.returnValues(observableOf({
           completed: true
-        }));
+        } as RequestEntry));
       });
 
       it('should return false', () => {
@@ -432,7 +433,7 @@ describe('RequestService', () => {
       let valid;
       const requestEntry = { completed: false };
       beforeEach(() => {
-        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry));
+        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry as RequestEntry));
         valid = serviceAsAny.isValid(requestEntry);
       });
       it('return an observable emitting false', () => {
@@ -444,7 +445,7 @@ describe('RequestService', () => {
       let valid;
       const requestEntry = { completed: true, response: { isSuccessful: false } };
       beforeEach(() => {
-        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry));
+        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry as RequestEntry));
         valid = serviceAsAny.isValid(requestEntry);
       });
       it('return an observable emitting false', () => {
@@ -470,7 +471,7 @@ describe('RequestService', () => {
 
       beforeEach(() => {
         spyOn(Date.prototype, 'getTime').and.returnValue(now);
-        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry));
+        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry as RequestEntry));
         valid = serviceAsAny.isValid(requestEntry);
       });
 
@@ -497,7 +498,7 @@ describe('RequestService', () => {
       };
       beforeEach(() => {
         spyOn(Date.prototype, 'getTime').and.returnValue(now);
-        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry));
+        spyOn(service, 'getByUUID').and.returnValue(observableOf(requestEntry as RequestEntry));
         valid = serviceAsAny.isValid(requestEntry);
       });
 
diff --git a/src/app/core/data/request.service.ts b/src/app/core/data/request.service.ts
index bd65163892..b811a75549 100644
--- a/src/app/core/data/request.service.ts
+++ b/src/app/core/data/request.service.ts
@@ -3,10 +3,8 @@ import { HttpHeaders } from '@angular/common/http';
 
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import { Observable, race as observableRace } from 'rxjs';
-import { filter, map, mergeMap, take } from 'rxjs/operators';
+import { filter, map, mergeMap, switchMap, take } from 'rxjs/operators';
 import { cloneDeep, remove } from 'lodash';
-
-import { AppState } from '../../app.reducer';
 import { hasValue, isEmpty, isNotEmpty } from '../../shared/empty.util';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -19,7 +17,7 @@ import {
 } from '../index/index.selectors';
 import { UUIDService } from '../shared/uuid.service';
 import { RequestConfigureAction, RequestExecuteAction, RequestRemoveAction } from './request.actions';
-import { GetRequest, RestRequest, SubmissionRequest } from './request.models';
+import { GetRequest, RestRequest } from './request.models';
 import { RequestEntry, RequestState } from './request.reducer';
 import { CommitSSBAction } from '../cache/server-sync-buffer.actions';
 import { RestRequestMethod } from './rest-request-method';
@@ -52,7 +50,7 @@ const entryFromUUIDSelector = (uuid: string): MemoizedSelector<CoreState, Reques
  * @param href        Substring that the request's href should contain
  */
 const uuidsFromHrefSubstringSelector =
-  (selector: MemoizedSelector<AppState, IndexState>, href: string): MemoizedSelector<AppState, string[]> => createSelector(
+  (selector: MemoizedSelector<CoreState, IndexState>, href: string): MemoizedSelector<CoreState, string[]> => createSelector(
     selector,
     (state: IndexState) => getUuidsFromHrefSubstring(state, href)
   );
@@ -304,6 +302,7 @@ export class RequestService {
    */
   hasByHref(href: string): boolean {
     let result = false;
+    /* NB: that this is only a solution because the select method is synchronous, see: https://github.com/ngrx/store/issues/296#issuecomment-269032571*/
     this.getByHref(href).pipe(
       take(1)
     ).subscribe((requestEntry: RequestEntry) => result = this.isValid(requestEntry));
diff --git a/src/app/core/data/resource-policy.service.ts b/src/app/core/data/resource-policy.service.ts
index 1574111232..017e5cf5ee 100644
--- a/src/app/core/data/resource-policy.service.ts
+++ b/src/app/core/data/resource-policy.service.ts
@@ -6,7 +6,7 @@ import { Observable } from 'rxjs';
 
 import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
-import { FindAllOptions } from '../data/request.models';
+import { FindListOptions } from '../data/request.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { ResourcePolicy } from '../shared/resource-policy.model';
 import { RemoteData } from '../data/remote-data';
@@ -36,7 +36,7 @@ class DataServiceImpl extends DataService<ResourcePolicy> {
     super();
   }
 
-  getBrowseEndpoint(options: FindAllOptions = {}, linkPath: string = this.linkPath): Observable<string> {
+  getBrowseEndpoint(options: FindListOptions = {}, linkPath: string = this.linkPath): Observable<string> {
     return this.halService.getEndpoint(linkPath);
   }
 }
diff --git a/src/app/core/data/search-response-parsing.service.ts b/src/app/core/data/search-response-parsing.service.ts
index 9ab0104393..c449fa872f 100644
--- a/src/app/core/data/search-response-parsing.service.ts
+++ b/src/app/core/data/search-response-parsing.service.ts
@@ -6,7 +6,7 @@ import { RestRequest } from './request.models';
 import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
 import { DSpaceRESTv2Serializer } from '../dspace-rest-v2/dspace-rest-v2.serializer';
 import { hasValue } from '../../shared/empty.util';
-import { SearchQueryResponse } from '../../+search-page/search-service/search-query-response.model';
+import { SearchQueryResponse } from '../../shared/search/search-query-response.model';
 import { MetadataMap, MetadataValue } from '../shared/metadata.models';
 
 @Injectable()
@@ -22,6 +22,10 @@ export class SearchResponseParsingService implements ResponseParsingService {
       }
     };
     const payload = data.payload._embedded.searchResult || emptyPayload;
+    payload.appliedFilters = data.payload.appliedFilters;
+    payload.sort = data.payload.sort;
+    payload.scope = data.payload.scope;
+    payload.configuration = data.payload.configuration;
     const hitHighlights: MetadataMap[] = payload._embedded.objects
       .map((object) => object.hitHighlights)
       .map((hhObject) => {
diff --git a/src/app/core/data/site-data.service.spec.ts b/src/app/core/data/site-data.service.spec.ts
new file mode 100644
index 0000000000..6148135f50
--- /dev/null
+++ b/src/app/core/data/site-data.service.spec.ts
@@ -0,0 +1,104 @@
+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 { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { of as observableOf } from 'rxjs';
+import { RestResponse } from '../cache/response.models';
+import { RequestEntry } from './request.reducer';
+import { FindListOptions } from './request.models';
+import { TestScheduler } from 'rxjs/testing';
+import { PaginatedList } from './paginated-list';
+import { RemoteData } from './remote-data';
+
+describe('SiteDataService', () => {
+  let scheduler: TestScheduler;
+  let service: SiteDataService;
+  let halService: HALEndpointService;
+  let requestService: RequestService;
+  let rdbService: RemoteDataBuildService;
+  let objectCache: ObjectCacheService;
+
+  const testObject = Object.assign(new Site(), {
+    uuid: '9b4f22f4-164a-49db-8817-3316b6ee5746',
+  });
+
+  const requestUUID = '34cfed7c-f597-49ef-9cbe-ea351f0023c2';
+  const options = Object.assign(new FindListOptions(), {});
+
+  const getRequestEntry$ = (successful: boolean, statusCode: number, statusText: string) => {
+    return observableOf({
+      response: new RestResponse(successful, statusCode, statusText)
+    } as RequestEntry);
+  };
+
+  const siteLink = 'https://rest.api/rest/api/config/sites';
+
+  beforeEach(() => {
+    scheduler = getTestScheduler();
+
+    halService = jasmine.createSpyObj('halService', {
+      getEndpoint: cold('a', {a: siteLink})
+    });
+    requestService = jasmine.createSpyObj('requestService', {
+      generateRequestId: requestUUID,
+      configure: true,
+      getByHref: getRequestEntry$(true, 200, 'Success')
+    });
+    rdbService = jasmine.createSpyObj('rdbService', {
+      buildList: cold('a', {
+        a: new RemoteData(false, false, true, undefined, new PaginatedList(null, [testObject]))
+      })
+    });
+
+    const store = {} as Store<CoreState>;
+    objectCache = {} as ObjectCacheService;
+    const notificationsService = {} as NotificationsService;
+    const http = {} as HttpClient;
+    const comparator = {} as any;
+    const dataBuildService = {} as NormalizedObjectBuildService;
+
+    service = new SiteDataService(
+      requestService,
+      rdbService,
+      dataBuildService,
+      store,
+      objectCache,
+      halService,
+      notificationsService,
+      http,
+      comparator
+    );
+  });
+
+  describe('getBrowseEndpoint', () => {
+    it('should return the Static Page endpoint', () => {
+
+      const result = service.getBrowseEndpoint(options);
+      const expected = cold('b', {b: siteLink});
+
+      expect(result).toBeObservable(expected);
+    });
+  });
+
+  describe('find', () => {
+    it('should return the Site object', () => {
+
+      spyOn(service, 'findAll').and.returnValue(cold('a', {
+        a: new RemoteData(false, false, true, undefined, new PaginatedList(null, [testObject]))
+      }));
+
+      const expected = cold('(b|)', {b: testObject});
+      const result = service.find();
+
+      expect(result).toBeObservable(expected);
+    });
+  });
+});
diff --git a/src/app/core/data/site-data.service.ts b/src/app/core/data/site-data.service.ts
new file mode 100644
index 0000000000..c1a1b2069b
--- /dev/null
+++ b/src/app/core/data/site-data.service.ts
@@ -0,0 +1,62 @@
+import { DataService } from './data.service';
+import { Site } from '../shared/site.model';
+import { RequestService } from './request.service';
+import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
+import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
+import { Store } from '@ngrx/store';
+import { CoreState } from '../core.reducers';
+import { ObjectCacheService } from '../cache/object-cache.service';
+import { HALEndpointService } from '../shared/hal-endpoint.service';
+import { NotificationsService } from '../../shared/notifications/notifications.service';
+import { HttpClient } from '@angular/common/http';
+import { DSOChangeAnalyzer } from './dso-change-analyzer.service';
+import { FindListOptions } from './request.models';
+import { Observable } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { RemoteData } from './remote-data';
+import { PaginatedList } from './paginated-list';
+import { Injectable } from '@angular/core';
+import { getSucceededRemoteData } from '../shared/operators';
+
+/**
+ * Service responsible for handling requests related to the Site object
+ */
+@Injectable()
+export class SiteDataService extends DataService<Site> {​
+  protected linkPath = 'sites';
+  protected forceBypassCache = false;
+
+  constructor(
+    protected requestService: RequestService,
+    protected rdbService: RemoteDataBuildService,
+    protected dataBuildService: NormalizedObjectBuildService,
+    protected store: Store<CoreState>,
+    protected objectCache: ObjectCacheService,
+    protected halService: HALEndpointService,
+    protected notificationsService: NotificationsService,
+    protected http: HttpClient,
+    protected comparator: DSOChangeAnalyzer<Site>,
+  ) {
+    super();
+  }
+
+  /**
+   * Get the endpoint for browsing the site object
+   * @param {FindListOptions} options
+   * @param {Observable<string>} linkPath
+   */
+  getBrowseEndpoint(options: FindListOptions, linkPath?: string): Observable<string> {
+    return this.halService.getEndpoint(this.linkPath);
+  }
+
+  /**
+   * Retrieve the Site Object
+   */
+  find(): Observable<Site> {
+    return this.findAll().pipe(
+      getSucceededRemoteData(),
+      map((remoteData: RemoteData<PaginatedList<Site>>) => remoteData.payload),
+      map((list: PaginatedList<Site>) => list.page[0])
+    );
+  }
+}
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
new file mode 100644
index 0000000000..cbf2a49c48
--- /dev/null
+++ b/src/app/core/data/status-code-only-response-parsing.service.spec.ts
@@ -0,0 +1,93 @@
+import { StatusCodeOnlyResponseParsingService } from './status-code-only-response-parsing.service';
+
+describe('StatusCodeOnlyResponseParsingService', () => {
+  let service;
+  let statusCode;
+  let statusText;
+
+  beforeEach(() => {
+    service = new StatusCodeOnlyResponseParsingService();
+  });
+
+  describe('parse', () => {
+
+    it('should return a RestResponse that doesn\'t contain the response body', () => {
+      const payload = 'd9128e44-183b-479d-aa2e-d39435838bf6';
+      const result = service.parse(undefined, {
+        payload,
+        statusCode: 201,
+        statusText: '201'
+      });
+
+      expect(JSON.stringify(result).indexOf(payload)).toBe(-1);
+    });
+
+    describe('when the response is successful', () => {
+      beforeEach(() => {
+        statusCode = 201;
+        statusText = `${statusCode}`;
+      });
+
+      it('should return a success RestResponse', () => {
+        const result = service.parse(undefined, {
+          statusCode,
+          statusText
+        });
+
+        expect(result.isSuccessful).toBe(true);
+      });
+
+      it('should return a RestResponse with the correct status code', () => {
+        const result = service.parse(undefined, {
+          statusCode,
+          statusText
+        });
+
+        expect(result.statusCode).toBe(statusCode);
+      });
+
+      it('should return a RestResponse with the correct status text', () => {
+        const result = service.parse(undefined, {
+          statusCode,
+          statusText
+        });
+
+        expect(result.statusText).toBe(statusText);
+      });
+    });
+
+    describe('when the response is unsuccessful', () => {
+      beforeEach(() => {
+        statusCode = 400;
+        statusText = `${statusCode}`;
+      });
+
+      it('should return an error RestResponse', () => {
+        const result = service.parse(undefined, {
+          statusCode,
+          statusText
+        });
+
+        expect(result.isSuccessful).toBe(false);
+      });
+
+      it('should return a RestResponse with the correct status code', () => {
+        const result = service.parse(undefined, {
+          statusCode,
+          statusText
+        });
+
+        expect(result.statusCode).toBe(statusCode);
+      });
+
+      it('should return a RestResponse with the correct status text', () => {
+        const result = service.parse(undefined, {
+          statusCode,
+          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
new file mode 100644
index 0000000000..b9812dcfee
--- /dev/null
+++ b/src/app/core/data/status-code-only-response-parsing.service.ts
@@ -0,0 +1,26 @@
+import { Injectable } from '@angular/core';
+import { RestResponse } from '../cache/response.models';
+import { DSpaceRESTV2Response } from '../dspace-rest-v2/dspace-rest-v2-response.model';
+import { ResponseParsingService } from './parsing.service';
+import { RestRequest } from './request.models';
+
+/**
+ * A responseparser that will only look at the status code and status
+ * text of the response, and ignore anything else that might be there
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class StatusCodeOnlyResponseParsingService implements ResponseParsingService {
+
+  /**
+   * Parse the response and only extract the status code and status text
+   *
+   * @param request The request that was sent to the server
+   * @param data The response to parse
+   */
+  parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+    const isSuccessful = data.statusCode >= 200 && data.statusCode < 300;
+    return new RestResponse(isSuccessful, data.statusCode, data.statusText);
+  }
+}
diff --git a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
index 290f4be8a2..cf9b1067c1 100644
--- a/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
+++ b/src/app/core/dspace-rest-v2/dspace-rest-v2.service.ts
@@ -26,7 +26,7 @@ export interface HttpOptions {
 @Injectable()
 export class DSpaceRESTv2Service {
 
-  constructor(private http: HttpClient) {
+  constructor(protected http: HttpClient) {
 
   }
 
diff --git a/src/app/core/eperson/eperson.service.ts b/src/app/core/eperson/eperson.service.ts
index 70ecf3f59e..81ae532e3b 100644
--- a/src/app/core/eperson/eperson.service.ts
+++ b/src/app/core/eperson/eperson.service.ts
@@ -1,5 +1,5 @@
 import { Observable } from 'rxjs';
-import { FindAllOptions } from '../data/request.models';
+import { FindListOptions } from '../data/request.models';
 import { DataService } from '../data/data.service';
 import { CacheableObject } from '../cache/object-cache.reducer';
 
@@ -8,7 +8,7 @@ import { CacheableObject } from '../cache/object-cache.reducer';
  */
 export abstract class EpersonService<TDomain extends CacheableObject> extends DataService<TDomain> {
 
-  public getBrowseEndpoint(options: FindAllOptions): Observable<string> {
+  public getBrowseEndpoint(options: FindListOptions): Observable<string> {
     return this.halService.getEndpoint(this.linkPath);
   }
 }
diff --git a/src/app/core/eperson/group-eperson.service.ts b/src/app/core/eperson/group-eperson.service.ts
index 2014e6120a..c8a2a78917 100644
--- a/src/app/core/eperson/group-eperson.service.ts
+++ b/src/app/core/eperson/group-eperson.service.ts
@@ -7,7 +7,7 @@ import { filter, map, take } from 'rxjs/operators';
 
 import { EpersonService } from './eperson.service';
 import { RequestService } from '../data/request.service';
-import { FindAllOptions } from '../data/request.models';
+import { FindListOptions } from '../data/request.models';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { Group } from './models/group.model';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
@@ -52,7 +52,7 @@ export class GroupEpersonService extends EpersonService<Group> {
    */
   isMemberOf(groupName: string): Observable<boolean> {
     const searchHref = 'isMemberOf';
-    const options = new FindAllOptions();
+    const options = new FindListOptions();
     options.searchParams = [new SearchParam('groupName', groupName)];
 
     return this.searchBy(searchHref, options).pipe(
diff --git a/src/app/core/eperson/models/normalized-eperson.model.ts b/src/app/core/eperson/models/normalized-eperson.model.ts
index 9a3bf4c246..489bf259c6 100644
--- a/src/app/core/eperson/models/normalized-eperson.model.ts
+++ b/src/app/core/eperson/models/normalized-eperson.model.ts
@@ -9,6 +9,7 @@ import { Group } from './group.model';
 @mapsTo(EPerson)
 @inheritSerialization(NormalizedDSpaceObject)
 export class NormalizedEPerson extends NormalizedDSpaceObject<EPerson> implements CacheableObject {
+
   /**
    * A string representing the unique handle of this EPerson
    */
diff --git a/src/app/shared/history/history.actions.ts b/src/app/core/history/history.actions.ts
similarity index 91%
rename from src/app/shared/history/history.actions.ts
rename to src/app/core/history/history.actions.ts
index ad970bd350..d4e621cc1c 100644
--- a/src/app/shared/history/history.actions.ts
+++ b/src/app/core/history/history.actions.ts
@@ -1,6 +1,6 @@
 import { Action } from '@ngrx/store';
 
-import { type } from '../ngrx/type';
+import { type } from '../../shared/ngrx/type';
 
 export const HistoryActionTypes = {
   ADD_TO_HISTORY: type('dspace/history/ADD_TO_HISTORY'),
diff --git a/src/app/shared/history/history.reducer.spec.ts b/src/app/core/history/history.reducer.spec.ts
similarity index 100%
rename from src/app/shared/history/history.reducer.spec.ts
rename to src/app/core/history/history.reducer.spec.ts
diff --git a/src/app/shared/history/history.reducer.ts b/src/app/core/history/history.reducer.ts
similarity index 100%
rename from src/app/shared/history/history.reducer.ts
rename to src/app/core/history/history.reducer.ts
diff --git a/src/app/core/history/selectors.ts b/src/app/core/history/selectors.ts
new file mode 100644
index 0000000000..5c77cd65f0
--- /dev/null
+++ b/src/app/core/history/selectors.ts
@@ -0,0 +1,8 @@
+import { CoreState } from '../core.reducers';
+import { createSelector } from '@ngrx/store';
+import { coreSelector } from '../core.selectors';
+
+export const historySelector = createSelector(
+  coreSelector,
+  (state: CoreState) => state.history
+);
diff --git a/src/app/core/index/index.selectors.ts b/src/app/core/index/index.selectors.ts
index a6d7b7e7b0..de4adab09b 100644
--- a/src/app/core/index/index.selectors.ts
+++ b/src/app/core/index/index.selectors.ts
@@ -1,5 +1,4 @@
 import { createSelector, MemoizedSelector } from '@ngrx/store';
-import { AppState } from '../../app.reducer';
 import { hasValue } from '../../shared/empty.util';
 import { CoreState } from '../core.reducers';
 import { coreSelector } from '../core.selectors';
@@ -11,7 +10,7 @@ import { IndexName, IndexState, MetaIndexState } from './index.reducer';
  * @returns
  *    a MemoizedSelector to select the MetaIndexState
  */
-export const metaIndexSelector: MemoizedSelector<AppState, MetaIndexState> = createSelector(
+export const metaIndexSelector: MemoizedSelector<CoreState, MetaIndexState> = createSelector(
   coreSelector,
   (state: CoreState) => state.index
 );
@@ -23,7 +22,7 @@ export const metaIndexSelector: MemoizedSelector<AppState, MetaIndexState> = cre
  * @returns
  *    a MemoizedSelector to select the object index
  */
-export const objectIndexSelector: MemoizedSelector<AppState, IndexState> = createSelector(
+export const objectIndexSelector: MemoizedSelector<CoreState, IndexState> = createSelector(
   metaIndexSelector,
   (state: MetaIndexState) => state[IndexName.OBJECT]
 );
@@ -34,7 +33,7 @@ export const objectIndexSelector: MemoizedSelector<AppState, IndexState> = creat
  * @returns
  *    a MemoizedSelector to select the request index
  */
-export const requestIndexSelector: MemoizedSelector<AppState, IndexState> = createSelector(
+export const requestIndexSelector: MemoizedSelector<CoreState, IndexState> = createSelector(
   metaIndexSelector,
   (state: MetaIndexState) => state[IndexName.REQUEST]
 );
@@ -45,7 +44,7 @@ export const requestIndexSelector: MemoizedSelector<AppState, IndexState> = crea
  * @returns
  *    a MemoizedSelector to select the request UUID mapping
  */
-export const requestUUIDIndexSelector: MemoizedSelector<AppState, IndexState> = createSelector(
+export const requestUUIDIndexSelector: MemoizedSelector<CoreState, IndexState> = createSelector(
   metaIndexSelector,
   (state: MetaIndexState) => state[IndexName.UUID_MAPPING]
 );
@@ -53,14 +52,13 @@ export const requestUUIDIndexSelector: MemoizedSelector<AppState, IndexState> =
 /**
  * Return the self link of an object in the object-cache based on its UUID
  *
- * @param id
+ * @param uuid
  *    the UUID for which you want to find the matching self link
- * @param identifierType the type of index, used to select index from state
  * @returns
  *    a MemoizedSelector to select the self link
  */
 export const selfLinkFromUuidSelector =
-  (uuid: string): MemoizedSelector<AppState, string> => createSelector(
+  (uuid: string): MemoizedSelector<CoreState, string> => createSelector(
     objectIndexSelector,
     (state: IndexState) => hasValue(state) ? state[uuid] : undefined
   );
@@ -74,7 +72,7 @@ export const selfLinkFromUuidSelector =
  *    a MemoizedSelector to select the UUID
  */
 export const uuidFromHrefSelector =
-  (href: string): MemoizedSelector<AppState, string> => createSelector(
+  (href: string): MemoizedSelector<CoreState, string> => createSelector(
     requestIndexSelector,
     (state: IndexState) => hasValue(state) ? state[href] : undefined
   );
@@ -89,7 +87,7 @@ export const uuidFromHrefSelector =
  *    a MemoizedSelector to select the UUID of the cached request
  */
 export const originalRequestUUIDFromRequestUUIDSelector =
-  (uuid: string): MemoizedSelector<AppState, string> => createSelector(
+  (uuid: string): MemoizedSelector<CoreState, string> => createSelector(
     requestUUIDIndexSelector,
     (state: IndexState) => hasValue(state) ? state[uuid] : undefined
   );
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 90eaf87a0e..c1b37bf904 100644
--- a/src/app/core/json-patch/json-patch-operations.service.ts
+++ b/src/app/core/json-patch/json-patch-operations.service.ts
@@ -17,7 +17,6 @@ import {
 } from './json-patch-operations.actions';
 import { JsonPatchOperationModel } from './json-patch.model';
 import { getResponseFromEntry } from '../shared/operators';
-import { ObjectCacheEntry } from '../cache/object-cache.reducer';
 
 /**
  * An abstract class that provides methods to make JSON Patch requests.
@@ -88,8 +87,8 @@ export abstract class JsonPatchOperationsService<ResponseDefinitionDomain, Patch
         flatMap(() => {
           const [successResponse$, errorResponse$] = partition((response: RestResponse) => response.isSuccessful)(this.requestService.getByUUID(requestId).pipe(
             getResponseFromEntry(),
-            find((entry: ObjectCacheEntry) => startTransactionTime < entry.timeAdded),
-            map((entry: ObjectCacheEntry) => entry),
+            find((entry: RestResponse) => startTransactionTime < entry.timeAdded),
+            map((entry: RestResponse) => entry),
           ));
           return observableMerge(
             errorResponse$.pipe(
diff --git a/src/app/core/metadata/metadata-field.model.ts b/src/app/core/metadata/metadata-field.model.ts
index 78d106f143..45ac4b2051 100644
--- a/src/app/core/metadata/metadata-field.model.ts
+++ b/src/app/core/metadata/metadata-field.model.ts
@@ -7,7 +7,7 @@ import { GenericConstructor } from '../shared/generic-constructor';
 /**
  * Class the represents a metadata field
  */
-export class MetadataField implements ListableObject {
+export class MetadataField extends ListableObject {
   static type = new ResourceType('metadatafield');
 
   /**
diff --git a/src/app/core/metadata/metadata-schema.model.ts b/src/app/core/metadata/metadata-schema.model.ts
index 78d5338f2e..2059b21094 100644
--- a/src/app/core/metadata/metadata-schema.model.ts
+++ b/src/app/core/metadata/metadata-schema.model.ts
@@ -5,7 +5,7 @@ import { GenericConstructor } from '../shared/generic-constructor';
 /**
  * Class that represents a metadata schema
  */
-export class MetadataSchema implements ListableObject {
+export class MetadataSchema extends ListableObject {
   static type = new ResourceType('metadataschema');
 
   /**
diff --git a/src/app/core/metadata/normalized-metadata-field.model.ts b/src/app/core/metadata/normalized-metadata-field.model.ts
index 075dda79d2..3d8750778d 100644
--- a/src/app/core/metadata/normalized-metadata-field.model.ts
+++ b/src/app/core/metadata/normalized-metadata-field.model.ts
@@ -2,7 +2,6 @@ import { autoserialize, deserialize, inheritSerialization } from 'cerialize';
 import { mapsTo, relationship } from '../cache/builders/build-decorators';
 import { MetadataField } from './metadata-field.model';
 import { NormalizedObject } from '../cache/models/normalized-object.model';
-import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { MetadataSchema } from './metadata-schema.model';
 
 /**
diff --git a/src/app/core/metadata/normalized-metadata-schema.model.ts b/src/app/core/metadata/normalized-metadata-schema.model.ts
index 1aa5609090..4b534725f4 100644
--- a/src/app/core/metadata/normalized-metadata-schema.model.ts
+++ b/src/app/core/metadata/normalized-metadata-schema.model.ts
@@ -1,7 +1,6 @@
 import { autoserialize, inheritSerialization } from 'cerialize';
 import { NormalizedObject } from '../cache/models/normalized-object.model';
 import { mapsTo } from '../cache/builders/build-decorators';
-import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
 import { MetadataSchema } from './metadata-schema.model';
 
 /**
@@ -33,4 +32,5 @@ export class NormalizedMetadataSchema extends NormalizedObject<MetadataSchema> {
    */
   @autoserialize
   namespace: string;
+
 }
diff --git a/src/app/core/router/router.actions.ts b/src/app/core/router/router.actions.ts
new file mode 100644
index 0000000000..e12356f372
--- /dev/null
+++ b/src/app/core/router/router.actions.ts
@@ -0,0 +1,22 @@
+import { Action } from '@ngrx/store';
+import { type } from '../../shared/ngrx/type';
+
+/**
+ * The list of HrefIndexAction type definitions
+ */
+export const RouterActionTypes = {
+  ROUTE_UPDATE: type('dspace/core/router/ROUTE_UPDATE'),
+};
+
+/* tslint:disable:max-classes-per-file */
+/**
+ * An ngrx action to be fired when the route is updated
+ * Note that, contrary to the router-store.ROUTER_NAVIGATION action,
+ * this action will only be fired when the path changes,
+ * not when just the query parameters change
+ */
+export class RouteUpdateAction implements Action {
+  type = RouterActionTypes.ROUTE_UPDATE;
+}
+
+/* tslint:enable:max-classes-per-file */
diff --git a/src/app/core/router/router.effects.ts b/src/app/core/router/router.effects.ts
new file mode 100644
index 0000000000..b73d11c1d6
--- /dev/null
+++ b/src/app/core/router/router.effects.ts
@@ -0,0 +1,31 @@
+import { filter, map, pairwise } from 'rxjs/operators';
+import { Injectable } from '@angular/core';
+import { Actions, Effect, ofType } from '@ngrx/effects'
+import * as fromRouter from '@ngrx/router-store';
+import { RouterNavigationAction } from '@ngrx/router-store';
+import { Router } from '@angular/router';
+import { RouteUpdateAction } from './router.actions';
+
+@Injectable()
+export class RouterEffects {
+  /**
+   * Effect that fires a new RouteUpdateAction when then path of route is changed
+   * @type {Observable<RouteUpdateAction>}
+   */
+  @Effect() routeChange$ = this.actions$
+    .pipe(
+      ofType(fromRouter.ROUTER_NAVIGATION),
+      pairwise(),
+      map((actions: RouterNavigationAction[]) =>
+        actions.map((navigateAction) => {
+          const urlTree = this.router.parseUrl(navigateAction.payload.routerState.url);
+          return urlTree.root.children.primary.segments.map((it) => it.path).join('/');
+        })),
+      filter((actions: string[]) => actions[0] !== actions[1]),
+      map(() => new RouteUpdateAction())
+    );
+
+  constructor(private actions$: Actions, private router: Router) {
+  }
+
+}
diff --git a/src/app/core/services/route.actions.ts b/src/app/core/services/route.actions.ts
index 968319d260..1f6381d2c6 100644
--- a/src/app/core/services/route.actions.ts
+++ b/src/app/core/services/route.actions.ts
@@ -10,6 +10,8 @@ export const RouteActionTypes = {
   SET_PARAMETERS: type('dspace/core/route/SET_PARAMETERS'),
   ADD_QUERY_PARAMETER: type('dspace/core/route/ADD_QUERY_PARAMETER'),
   ADD_PARAMETER: type('dspace/core/route/ADD_PARAMETER'),
+  SET_QUERY_PARAMETER: type('dspace/core/route/SET_QUERY_PARAMETER'),
+  SET_PARAMETER: type('dspace/core/route/SET_PARAMETER'),
   RESET: type('dspace/core/route/RESET'),
 };
 
@@ -96,6 +98,52 @@ export class AddParameterAction implements Action {
   }
 }
 
+/**
+ * An ngrx action to set a query parameter
+ */
+export class SetQueryParameterAction implements Action {
+  type = RouteActionTypes.SET_QUERY_PARAMETER;
+  payload: {
+    key: string;
+    value: string;
+  };
+
+  /**
+   * Create a new SetQueryParameterAction
+   *
+   * @param key
+   *    the key to set
+   * @param value
+   *    the value of this key
+   */
+  constructor(key: string, value: string) {
+    this.payload = { key, value };
+  }
+}
+
+/**
+ * An ngrx action to set a parameter
+ */
+export class SetParameterAction implements Action {
+  type = RouteActionTypes.SET_PARAMETER;
+  payload: {
+    key: string;
+    value: string;
+  };
+
+  /**
+   * Create a new SetParameterAction
+   *
+   * @param key
+   *    the key to set
+   * @param value
+   *    the value of this key
+   */
+  constructor(key: string, value: string) {
+    this.payload = { key, value };
+  }
+}
+
 /**
  * An ngrx action to reset the route state
  */
@@ -113,4 +161,5 @@ export type RouteActions =
   | SetParametersAction
   | AddQueryParameterAction
   | AddParameterAction
-  | ResetRouteStateAction;
+  | ResetRouteStateAction
+  | SetParameterAction;
diff --git a/src/app/core/services/route.effects.ts b/src/app/core/services/route.effects.ts
index 687f8f9921..f0a9f7521c 100644
--- a/src/app/core/services/route.effects.ts
+++ b/src/app/core/services/route.effects.ts
@@ -1,8 +1,9 @@
-import { map } from 'rxjs/operators';
+import { map, tap } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
 import { Actions, Effect, ofType } from '@ngrx/effects'
-import * as fromRouter from '@ngrx/router-store';
-import { ResetRouteStateAction } from './route.actions';
+import { ResetRouteStateAction, RouteActionTypes } from './route.actions';
+import { RouterActionTypes } from '../../core/router/router.actions';
+import { RouteService } from './route.service';
 
 @Injectable()
 export class RouteEffects {
@@ -12,12 +13,16 @@ export class RouteEffects {
    */
   @Effect() routeChange$ = this.actions$
     .pipe(
-      ofType(fromRouter.ROUTER_NAVIGATION),
-      map(() => new ResetRouteStateAction())
+      ofType(RouterActionTypes.ROUTE_UPDATE),
+      map(() => new ResetRouteStateAction()),
     );
 
-  constructor(private actions$: Actions) {
+  @Effect({dispatch: false }) afterResetChange$ = this.actions$
+    .pipe(
+      ofType(RouteActionTypes.RESET),
+      tap(() => this.service.setCurrentRouteInfo()),
+    );
 
+  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 b078521c11..2d5356a5db 100644
--- a/src/app/core/services/route.reducer.ts
+++ b/src/app/core/services/route.reducer.ts
@@ -3,7 +3,11 @@ import {
   AddParameterAction,
   AddQueryParameterAction,
   RouteActions,
-  RouteActionTypes, SetParametersAction, SetQueryParametersAction
+  RouteActionTypes,
+  SetParameterAction,
+  SetParametersAction,
+  SetQueryParameterAction,
+  SetQueryParametersAction
 } from './route.actions';
 
 /**
@@ -44,6 +48,12 @@ export function routeReducer(state = initialState, action: RouteActions): RouteS
     case RouteActionTypes.ADD_QUERY_PARAMETER: {
       return addParameter(state, action as AddQueryParameterAction, 'queryParams');
     }
+    case RouteActionTypes.SET_PARAMETER: {
+      return setParameter(state, action as SetParameterAction, 'params');
+    }
+    case RouteActionTypes.SET_QUERY_PARAMETER: {
+      return setParameter(state, action as SetQueryParameterAction, 'queryParams');
+    }
     default: {
       return state;
     }
@@ -60,9 +70,10 @@ function addParameter(state: RouteState, action: AddParameterAction | AddQueryPa
   const subState = state[paramType];
   const existingValues = subState[action.payload.key] || [];
   const newValues = [...existingValues, action.payload.value];
-  const newSubstate = Object.assign(subState, { [action.payload.key]: newValues });
+  const newSubstate = Object.assign({}, subState, { [action.payload.key]: newValues });
   return Object.assign({}, state, { [paramType]: newSubstate });
 }
+
 /**
  * Set a route or query parameter in the store
  * @param state The current state
@@ -70,5 +81,17 @@ function addParameter(state: RouteState, action: AddParameterAction | AddQueryPa
  * @param paramType The type of parameter to set: route or query parameter
  */
 function setParameters(state: RouteState, action: SetParametersAction | SetQueryParametersAction, paramType: string): RouteState {
-  return Object.assign({}, state, { [paramType]: action.payload });
+  return Object.assign({}, state, { [paramType]: { [action.payload.key]: action.payload.value } });
+}
+
+/**
+ * Set a route or query parameter in the store
+ * @param state The current state
+ * @param action The set action to perform on the current state
+ * @param paramType The type of parameter to set: route or query parameter
+ */
+function setParameter(state: RouteState, action: SetParameterAction | SetQueryParameterAction, paramType: string): RouteState {
+  const subState = state[paramType];
+  const newSubstate = Object.assign({}, subState, { [action.payload.key]: action.payload.value });
+  return Object.assign({}, state, { [paramType]: newSubstate });
 }
diff --git a/src/app/core/services/route.service.spec.ts b/src/app/core/services/route.service.spec.ts
index ae31f28384..07ff56d879 100644
--- a/src/app/core/services/route.service.spec.ts
+++ b/src/app/core/services/route.service.spec.ts
@@ -8,7 +8,7 @@ import { getTestScheduler, hot } from 'jasmine-marbles';
 import { RouteService } from './route.service';
 import { MockRouter } from '../../shared/mocks/mock-router';
 import { TestScheduler } from 'rxjs/testing';
-import { AddUrlToHistoryAction } from '../../shared/history/history.actions';
+import { AddUrlToHistoryAction } from '../history/history.actions';
 
 describe('RouteService', () => {
   let scheduler: TestScheduler;
@@ -142,7 +142,11 @@ describe('RouteService', () => {
 
   describe('getHistory', () => {
     it('should dispatch AddUrlToHistoryAction on NavigationEnd event', () => {
-      serviceAsAny.store = observableOf({ history: ['url', 'newurl'] });
+      serviceAsAny.store = observableOf({
+        core: {
+          history: ['url', 'newurl']
+        }
+      });
 
       service.getHistory().subscribe((history) => {
         expect(history).toEqual(['url', 'newurl']);
diff --git a/src/app/core/services/route.service.ts b/src/app/core/services/route.service.ts
index 65aa858945..661f4acf94 100644
--- a/src/app/core/services/route.service.ts
+++ b/src/app/core/services/route.service.ts
@@ -1,23 +1,17 @@
-import { distinctUntilChanged, filter, map, tap } from 'rxjs/operators';
+import { distinctUntilChanged, filter, map, take } from 'rxjs/operators';
 import { Injectable } from '@angular/core';
-import {
-  ActivatedRoute,
-  NavigationEnd,
-  Params,
-  Router,
-  RouterStateSnapshot,
-} from '@angular/router';
+import { ActivatedRoute, NavigationEnd, Params, Router, RouterStateSnapshot, } from '@angular/router';
 
 import { combineLatest, Observable } from 'rxjs';
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import { isEqual } from 'lodash';
 
-import { AddUrlToHistoryAction } from '../../shared/history/history.actions';
-import { historySelector } from '../../shared/history/selectors';
-import { SetParametersAction, SetQueryParametersAction } from './route.actions';
+import { AddParameterAction, SetParameterAction, SetParametersAction, SetQueryParametersAction } from './route.actions';
 import { CoreState } from '../core.reducers';
-import { hasValue } from '../../shared/empty.util';
 import { coreSelector } from '../core.selectors';
+import { hasValue } from '../../shared/empty.util';
+import { historySelector } from '../history/selectors';
+import { AddUrlToHistoryAction } from '../history/history.actions';
 
 /**
  * Selector to select all route parameters from the store
@@ -121,7 +115,7 @@ export class RouteService {
   }
 
   getRouteDataValue(datafield: string): Observable<any> {
-    return this.route.data.pipe(map((data) => data[datafield]), distinctUntilChanged(),);
+    return this.route.data.pipe(map((data) => data[datafield]), distinctUntilChanged());
   }
 
   /**
@@ -157,11 +151,9 @@ export class RouteService {
   }
 
   public saveRouting(): void {
-    combineLatest(this.router.events, this.getRouteParams(), this.route.queryParams)
-      .pipe(filter(([event, params, queryParams]) => event instanceof NavigationEnd))
-      .subscribe(([event, params, queryParams]: [NavigationEnd, Params, Params]) => {
-        this.store.dispatch(new SetParametersAction(params));
-        this.store.dispatch(new SetQueryParametersAction(queryParams));
+    this.router.events
+      .pipe(filter((event) => event instanceof NavigationEnd))
+      .subscribe((event: NavigationEnd) => {
         this.store.dispatch(new AddUrlToHistoryAction(event.urlAfterRedirects));
       });
   }
@@ -183,4 +175,36 @@ export class RouteService {
       map((history: string[]) => history[history.length - 2] || '')
     );
   }
+
+  /**
+   * Add a parameter to the current route
+   * @param key   The parameter name
+   * @param value The parameter value
+   */
+  public addParameter(key, value) {
+    this.store.dispatch(new AddParameterAction(key, value));
+  }
+
+  /**
+   * Set a parameter in the current route (overriding the previous value)
+   * @param key   The parameter name
+   * @param value The parameter value
+   */
+  public setParameter(key, value) {
+    this.store.dispatch(new SetParameterAction(key, value));
+  }
+
+  /**
+   * Sets the current route parameters and query parameters in the store
+   */
+  public setCurrentRouteInfo() {
+    combineLatest(this.getRouteParams(), this.route.queryParams)
+      .pipe(take(1))
+      .subscribe(
+        ([params, queryParams]: [Params, Params]) => {
+          this.store.dispatch(new SetParametersAction(params));
+          this.store.dispatch(new SetQueryParametersAction(queryParams));
+        }
+      )
+  }
 }
diff --git a/src/app/core/shared/browse-entry.model.ts b/src/app/core/shared/browse-entry.model.ts
index 977afb40f6..d6074de3f5 100644
--- a/src/app/core/shared/browse-entry.model.ts
+++ b/src/app/core/shared/browse-entry.model.ts
@@ -2,12 +2,13 @@ import { ListableObject } from '../../shared/object-collection/shared/listable-o
 import { TypedObject } from '../cache/object-cache.reducer';
 import { ResourceType } from './resource-type';
 import { GenericConstructor } from './generic-constructor';
+import { excludeFromEquals } from '../utilities/equals.decorators';
 
 /**
  * Class object representing a browse entry
  * This class is not normalized because browse entries do not have self links
  */
-export class BrowseEntry implements ListableObject {
+export class BrowseEntry extends ListableObject implements TypedObject {
   static type = new ResourceType('browseEntry');
 
   /**
@@ -28,6 +29,7 @@ export class BrowseEntry implements ListableObject {
   /**
    * The count of this browse entry
    */
+  @excludeFromEquals
   count: number;
 
   /**
diff --git a/src/app/core/shared/dspace-object.model.ts b/src/app/core/shared/dspace-object.model.ts
index 2e50f19c4f..4fec28d246 100644
--- a/src/app/core/shared/dspace-object.model.ts
+++ b/src/app/core/shared/dspace-object.model.ts
@@ -11,25 +11,29 @@ import { hasNoValue, isUndefined } from '../../shared/empty.util';
 import { CacheableObject } from '../cache/object-cache.reducer';
 import { RemoteData } from '../data/remote-data';
 import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
+import { excludeFromEquals } from '../utilities/equals.decorators';
 import { ResourceType } from './resource-type';
 import { GenericConstructor } from './generic-constructor';
 
 /**
  * An abstract model class for a DSpaceObject.
  */
-export class DSpaceObject implements CacheableObject, ListableObject {
+export class DSpaceObject extends ListableObject implements CacheableObject {
   /**
    * A string representing the kind of DSpaceObject, e.g. community, item, …
    */
   static type = new ResourceType('dspaceobject');
 
+  @excludeFromEquals
   private _name: string;
 
+  @excludeFromEquals
   self: string;
 
   /**
    * The human-readable identifier of this DSpaceObject
    */
+  @excludeFromEquals
   id: string;
 
   /**
@@ -37,6 +41,12 @@ export class DSpaceObject implements CacheableObject, ListableObject {
    */
   uuid: string;
 
+  /**
+   * A string representing the kind of DSpaceObject, e.g. community, item, …
+   */
+  @excludeFromEquals
+  type: ResourceType;
+
   /**
    * The name for this DSpaceObject
    */
@@ -54,6 +64,7 @@ export class DSpaceObject implements CacheableObject, ListableObject {
   /**
    * All metadata of this DSpaceObject
    */
+  @excludeFromEquals
   metadata: MetadataMap;
 
   /**
@@ -66,11 +77,13 @@ export class DSpaceObject implements CacheableObject, ListableObject {
   /**
    * An array of DSpaceObjects that are direct parents of this DSpaceObject
    */
+  @excludeFromEquals
   parents: Observable<RemoteData<DSpaceObject[]>>;
 
   /**
    * The DSpaceObject that owns this DSpaceObject
    */
+  @excludeFromEquals
   owner: Observable<RemoteData<DSpaceObject>>;
 
   /**
diff --git a/src/app/core/shared/external-source-entry.model.ts b/src/app/core/shared/external-source-entry.model.ts
new file mode 100644
index 0000000000..be52f96b07
--- /dev/null
+++ b/src/app/core/shared/external-source-entry.model.ts
@@ -0,0 +1,43 @@
+import { MetadataMap } from './metadata.models';
+import { ResourceType } from './resource-type';
+import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
+import { GenericConstructor } from './generic-constructor';
+
+/**
+ * Model class for a single entry from an external source
+ */
+export class ExternalSourceEntry extends ListableObject {
+  static type = new ResourceType('externalSourceEntry');
+
+  /**
+   * Unique identifier
+   */
+  id: string;
+
+  /**
+   * The value to display
+   */
+  display: string;
+
+  /**
+   * The value to store the entry with
+   */
+  value: string;
+
+  /**
+   * Metadata of the entry
+   */
+  metadata: MetadataMap;
+
+  /**
+   * The link to the rest endpoint where this External Source Entry can be found
+   */
+  self: string;
+
+  /**
+   * Method that returns as which type of object this object should be rendered
+   */
+  getRenderTypes(): Array<string | GenericConstructor<ListableObject>> {
+    return [this.constructor as GenericConstructor<ListableObject>];
+  }
+}
diff --git a/src/app/core/shared/external-source.model.ts b/src/app/core/shared/external-source.model.ts
new file mode 100644
index 0000000000..a158f18f5d
--- /dev/null
+++ b/src/app/core/shared/external-source.model.ts
@@ -0,0 +1,29 @@
+import { ResourceType } from './resource-type';
+import { CacheableObject } from '../cache/object-cache.reducer';
+
+/**
+ * Model class for an external source
+ */
+export class ExternalSource extends CacheableObject {
+  static type = new ResourceType('externalsource');
+
+  /**
+   * Unique identifier
+   */
+  id: string;
+
+  /**
+   * The name of this external source
+   */
+  name: string;
+
+  /**
+   * Is the source hierarchical?
+   */
+  hierarchical: boolean;
+
+  /**
+   * The link to the rest endpoint where this External Source can be found
+   */
+  self: string;
+}
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 2635f154a8..0fc52b00a5 100644
--- a/src/app/core/shared/item-relationships/item-type.model.ts
+++ b/src/app/core/shared/item-relationships/item-type.model.ts
@@ -12,6 +12,8 @@ export class ItemType implements CacheableObject {
    */
   id: string;
 
+  label: string;
+
   /**
    * The link to the rest endpoint where this object can be found
    */
diff --git a/src/app/core/shared/item-relationships/relationship.model.ts b/src/app/core/shared/item-relationships/relationship.model.ts
index 9ab9751489..2adcf42c04 100644
--- a/src/app/core/shared/item-relationships/relationship.model.ts
+++ b/src/app/core/shared/item-relationships/relationship.model.ts
@@ -46,6 +46,16 @@ export class Relationship implements CacheableObject {
    */
   rightPlace: number;
 
+  /**
+   * The name variant of the Item to the left side of this Relationship
+   */
+  leftwardValue: string;
+
+  /**
+   * The name variant of the Item to the right side of this Relationship
+   */
+  rightwardValue: string;
+
   /**
    * The type of Relationship
    */
diff --git a/src/app/core/shared/metadata.models.ts b/src/app/core/shared/metadata.models.ts
index 9c7e30dcb4..085cdb4504 100644
--- a/src/app/core/shared/metadata.models.ts
+++ b/src/app/core/shared/metadata.models.ts
@@ -81,6 +81,9 @@ export interface MetadataValueFilter {
   /** The value constraint. */
   value?: string;
 
+  /** The authority constraint. */
+  authority?: string;
+
   /** Whether the value constraint should match without regard to case. */
   ignoreCase?: boolean;
 
diff --git a/src/app/core/shared/metadata.utils.spec.ts b/src/app/core/shared/metadata.utils.spec.ts
index 1e1d7f86d5..f4b3517649 100644
--- a/src/app/core/shared/metadata.utils.spec.ts
+++ b/src/app/core/shared/metadata.utils.spec.ts
@@ -8,8 +8,8 @@ import {
 } from './metadata.models';
 import { Metadata } from './metadata.utils';
 
-const mdValue = (value: string, language?: string): MetadataValue => {
-  return Object.assign(new MetadataValue(), { uuid: uuidv4(), value: value, language: isUndefined(language) ? null : language, place: 0, authority: undefined, confidence: undefined });
+const mdValue = (value: string, language?: string, authority?: string): MetadataValue => {
+  return Object.assign(new MetadataValue(), { uuid: uuidv4(), value: value, language: isUndefined(language) ? null : language, place: 0, authority: isUndefined(authority) ? null : authority, confidence: undefined });
 };
 
 const dcDescription = mdValue('Some description');
@@ -184,6 +184,8 @@ describe('Metadata', () => {
     testValueMatches(mdValue('a'), true, { language: null });
     testValueMatches(mdValue('a'), false, { language: 'en_US' });
     testValueMatches(mdValue('a', 'en_US'), true, { language: 'en_US' });
+    testValueMatches(mdValue('a', undefined, '4321'), true, { authority: '4321' });
+    testValueMatches(mdValue('a', undefined, '4321'), false, { authority: '1234' });
   });
 
   describe('toViewModelList method', () => {
diff --git a/src/app/core/shared/metadata.utils.ts b/src/app/core/shared/metadata.utils.ts
index 62a1957e22..334c430968 100644
--- a/src/app/core/shared/metadata.utils.ts
+++ b/src/app/core/shared/metadata.utils.ts
@@ -127,6 +127,8 @@ export class Metadata {
       return true;
     } else if (filter.language && filter.language !== mdValue.language) {
       return false;
+    } else if (filter.authority && filter.authority !== mdValue.authority) {
+      return false;
     } else if (filter.value) {
       let fValue = filter.value;
       let mValue = mdValue.value;
diff --git a/src/app/core/shared/operators.ts b/src/app/core/shared/operators.ts
index b4c7c8f1a9..308e4f8a2d 100644
--- a/src/app/core/shared/operators.ts
+++ b/src/app/core/shared/operators.ts
@@ -9,8 +9,7 @@ import { RequestService } from '../data/request.service';
 import { BrowseDefinition } from './browse-definition.model';
 import { DSpaceObject } from './dspace-object.model';
 import { PaginatedList } from '../data/paginated-list';
-import { SearchResult } from '../../+search-page/search-result.model';
-import { Item } from './item.model';
+import { SearchResult } from '../../shared/search/search-result.model';
 import { Router } from '@angular/router';
 
 /**
diff --git a/src/app/core/shared/page-info.model.ts b/src/app/core/shared/page-info.model.ts
index 4ed281657d..273510da60 100644
--- a/src/app/core/shared/page-info.model.ts
+++ b/src/app/core/shared/page-info.model.ts
@@ -1,9 +1,11 @@
 import { autoserialize, autoserializeAs } from 'cerialize';
+import { hasValue } from '../../shared/empty.util';
 
 /**
  * Represents the state of a paginated response
  */
 export class PageInfo {
+
   /**
    * The number of elements on a page
    */
@@ -42,4 +44,20 @@ export class PageInfo {
 
   @autoserialize
   self: string;
+
+  constructor(
+    options?: {
+      elementsPerPage: number,
+      totalElements: number,
+      totalPages: number,
+      currentPage: number
+    }
+  ) {
+    if (hasValue(options)) {
+      this.elementsPerPage = options.elementsPerPage;
+      this.totalElements = options.totalElements;
+      this.totalPages = options.totalPages;
+      this.currentPage = options.currentPage;
+    }
+  }
 }
diff --git a/src/app/+search-page/search-service/search-configuration.service.spec.ts b/src/app/core/shared/search/search-configuration.service.spec.ts
similarity index 91%
rename from src/app/+search-page/search-service/search-configuration.service.spec.ts
rename to src/app/core/shared/search/search-configuration.service.spec.ts
index f1aedd9fe5..b5423e0df0 100644
--- a/src/app/+search-page/search-service/search-configuration.service.spec.ts
+++ b/src/app/core/shared/search/search-configuration.service.spec.ts
@@ -1,9 +1,9 @@
 import { SearchConfigurationService } from './search-configuration.service';
-import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { PaginatedSearchOptions } from '../paginated-search-options.model';
-import { SearchFilter } from '../search-filter.model';
+import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
+import { SearchFilter } from '../../../shared/search/search-filter.model';
 import { of as observableOf } from 'rxjs';
 
 describe('SearchConfigurationService', () => {
@@ -30,14 +30,10 @@ describe('SearchConfigurationService', () => {
     getRouteParameterValue: observableOf('')
   });
 
-  const fixedFilterService = jasmine.createSpyObj('SearchFixedFilterService', {
-    getQueryByFilterName: observableOf(''),
-  });
-
   const activatedRoute: any = new ActivatedRouteStub();
 
   beforeEach(() => {
-    service = new SearchConfigurationService(routeService, fixedFilterService, activatedRoute);
+    service = new SearchConfigurationService(routeService, activatedRoute);
   });
   describe('when the scope is called', () => {
     beforeEach(() => {
diff --git a/src/app/+search-page/search-service/search-configuration.service.ts b/src/app/core/shared/search/search-configuration.service.ts
similarity index 85%
rename from src/app/+search-page/search-service/search-configuration.service.ts
rename to src/app/core/shared/search/search-configuration.service.ts
index 5a2343b058..8ae0855cae 100644
--- a/src/app/+search-page/search-service/search-configuration.service.ts
+++ b/src/app/core/shared/search/search-configuration.service.ts
@@ -1,27 +1,19 @@
 import { Injectable, OnDestroy } from '@angular/core';
 import { ActivatedRoute, Params } from '@angular/router';
 
-import {
-  BehaviorSubject,
-  combineLatest as observableCombineLatest,
-  merge as observableMerge,
-  Observable,
-  of as observableOf,
-  Subscription
-} from 'rxjs';
-import { filter, flatMap, map, startWith, switchMap, tap } from 'rxjs/operators';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SearchOptions } from '../search-options.model';
-import { PaginatedSearchOptions } from '../paginated-search-options.model';
-import { RouteService } from '../../core/services/route.service';
-import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../shared/empty.util';
-import { RemoteData } from '../../core/data/remote-data';
-import { getSucceededRemoteData } from '../../core/shared/operators';
-import { SearchFilter } from '../search-filter.model';
-import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
-import { SearchFixedFilterService } from '../search-filters/search-filter/search-fixed-filter.service';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+import { BehaviorSubject, combineLatest as observableCombineLatest, merge as observableMerge, Observable, Subscription } from 'rxjs';
+import { filter, map, startWith, switchMap } from 'rxjs/operators';
+import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
+import { SearchOptions } from '../../../shared/search/search-options.model';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
+import { SearchFilter } from '../../../shared/search/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 { getSucceededRemoteData } from '../operators';
+import { hasNoValue, hasValue, isNotEmpty, isNotEmptyOperator } from '../../../shared/empty.util';
+import { createSuccessfulRemoteDataObject$ } from '../../../shared/testing/utils';
 
 /**
  * Service that performs all actions that have to do with the current search configuration
@@ -80,11 +72,9 @@ export class SearchConfigurationService implements OnDestroy {
   /**
    * Initialize the search options
    * @param {RouteService} routeService
-   * @param {SearchFixedFilterService} fixedFilterService
    * @param {ActivatedRoute} route
    */
   constructor(protected routeService: RouteService,
-              protected fixedFilterService: SearchFixedFilterService,
               protected route: ActivatedRoute) {
 
     this.initDefaults();
@@ -96,7 +86,7 @@ export class SearchConfigurationService implements OnDestroy {
   protected initDefaults() {
     this.defaults
       .pipe(getSucceededRemoteData())
-      .subscribe((defRD) => {
+      .subscribe((defRD: RemoteData<PaginatedSearchOptions>) => {
           const defs = defRD.payload;
           this.paginatedSearchOptions = new BehaviorSubject<PaginatedSearchOptions>(defs);
           this.searchOptions = new BehaviorSubject<SearchOptions>(defs);
@@ -205,6 +195,13 @@ export class SearchConfigurationService implements OnDestroy {
     }));
   }
 
+  /**
+   * @returns {Observable<string>} Emits the current fixed filter as a string
+   */
+  getCurrentFixedFilter(): Observable<string> {
+    return this.routeService.getRouteParameterValue('fixedFilterQuery');
+  }
+
   /**
    * @returns {Observable<Params>} Emits the current active filters with their values as they are displayed in the frontend URL
    */
@@ -224,9 +221,10 @@ export class SearchConfigurationService implements OnDestroy {
       this.getQueryPart(defaults.query),
       this.getDSOTypePart(),
       this.getFiltersPart(),
+      this.getFixedFilterPart()
     ).subscribe((update) => {
       const currentValue: SearchOptions = this.searchOptions.getValue();
-      const updatedValue: SearchOptions = Object.assign(currentValue, update);
+      const updatedValue: SearchOptions = Object.assign(new PaginatedSearchOptions({}), currentValue, update);
       this.searchOptions.next(updatedValue);
     });
   }
@@ -245,9 +243,10 @@ export class SearchConfigurationService implements OnDestroy {
       this.getQueryPart(defaults.query),
       this.getDSOTypePart(),
       this.getFiltersPart(),
+      this.getFixedFilterPart()
     ).subscribe((update) => {
       const currentValue: PaginatedSearchOptions = this.paginatedSearchOptions.getValue();
-      const updatedValue: PaginatedSearchOptions = Object.assign(currentValue, update);
+      const updatedValue: PaginatedSearchOptions = Object.assign(new PaginatedSearchOptions({}), currentValue, update);
       this.paginatedSearchOptions.next(updatedValue);
     });
   }
@@ -341,4 +340,16 @@ export class SearchConfigurationService implements OnDestroy {
       return { filters }
     }));
   }
+
+  /**
+   * @returns {Observable<string>} Emits the current fixed filter as a partial SearchOptions object
+   */
+  private getFixedFilterPart(): Observable<any> {
+    return this.getCurrentFixedFilter().pipe(
+      isNotEmptyOperator(),
+      map((fixedFilter) => {
+        return { fixedFilter }
+      }),
+    );
+  }
 }
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts b/src/app/core/shared/search/search-filter.service.spec.ts
similarity index 93%
rename from src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
rename to src/app/core/shared/search/search-filter.service.spec.ts
index 0ba1f88cc3..91f53da898 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.service.spec.ts
+++ b/src/app/core/shared/search/search-filter.service.spec.ts
@@ -8,14 +8,13 @@ import {
   SearchFilterInitializeAction,
   SearchFilterResetPageAction,
   SearchFilterToggleAction
-} from './search-filter.actions';
-import { SearchFiltersState } from './search-filter.reducer';
-import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
-import { FilterType } from '../../search-service/filter-type.model';
-import { SearchFixedFilterService } from './search-fixed-filter.service';
+} 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/search-filter-config.model';
+import { FilterType } from '../../../shared/search/filter-type.model';
 import { ActivatedRouteStub } from '../../../shared/testing/active-router-stub';
 import { of as observableOf } from 'rxjs';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
+import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
 
 describe('SearchFilterService', () => {
   let service: SearchFilterService;
@@ -28,7 +27,6 @@ describe('SearchFilterService', () => {
     pageSize: 2
   });
 
-  const mockFixedFilterService: SearchFixedFilterService = {} as SearchFixedFilterService
   const value1 = 'random value';
   // const value2 = 'another value';
   const store: Store<SearchFiltersState> = jasmine.createSpyObj('store', {
@@ -66,7 +64,7 @@ describe('SearchFilterService', () => {
   };
 
   beforeEach(() => {
-    service = new SearchFilterService(store, routeServiceStub, mockFixedFilterService);
+    service = new SearchFilterService(store, routeServiceStub);
   });
 
   describe('when the initializeFilter method is triggered', () => {
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.service.ts b/src/app/core/shared/search/search-filter.service.ts
similarity index 94%
rename from src/app/+search-page/search-filters/search-filter/search-filter.service.ts
rename to src/app/core/shared/search/search-filter.service.ts
index a453dc29bf..c1559db525 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.service.ts
+++ b/src/app/core/shared/search/search-filter.service.ts
@@ -1,7 +1,7 @@
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { distinctUntilChanged, map, mergeMap } from 'rxjs/operators';
 import { Injectable, InjectionToken } from '@angular/core';
-import { SearchFiltersState, SearchFilterState } from './search-filter.reducer';
+import { SearchFiltersState, SearchFilterState } from '../../../shared/search/search-filters/search-filter/search-filter.reducer';
 import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
 import {
   SearchFilterCollapseAction,
@@ -11,13 +11,12 @@ import {
   SearchFilterInitializeAction,
   SearchFilterResetPageAction,
   SearchFilterToggleAction
-} from './search-filter.actions';
+} from '../../../shared/search/search-filters/search-filter/search-filter.actions';
 import { hasValue, isNotEmpty, } from '../../../shared/empty.util';
-import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
+import { SearchFilterConfig } from '../../../shared/search/search-filter-config.model';
+import { SortDirection, SortOptions } from '../../cache/models/sort-options.model';
 import { RouteService } from '../../../core/services/route.service';
-import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { PaginationComponentOptions } from '../../../shared/pagination/pagination-component-options.model';
-import { SearchFixedFilterService } from './search-fixed-filter.service';
 import { Params } from '@angular/router';
 
 const filterStateSelector = (state: SearchFiltersState) => state.searchFilter;
@@ -32,8 +31,7 @@ export const IN_PLACE_SEARCH: InjectionToken<boolean> = new InjectionToken<boole
 export class SearchFilterService {
 
   constructor(private store: Store<SearchFiltersState>,
-              private routeService: RouteService,
-              private fixedFilterService: SearchFixedFilterService) {
+              private routeService: RouteService) {
   }
 
   /**
diff --git a/src/app/+search-page/search-service/search.service.spec.ts b/src/app/core/shared/search/search.service.spec.ts
similarity index 87%
rename from src/app/+search-page/search-service/search.service.spec.ts
rename to src/app/core/shared/search/search.service.spec.ts
index 4f91dde312..0e093d119c 100644
--- a/src/app/+search-page/search-service/search.service.spec.ts
+++ b/src/app/core/shared/search/search.service.spec.ts
@@ -5,27 +5,27 @@ import { CommonModule } from '@angular/common';
 import { Component } from '@angular/core';
 
 import { SearchService } from './search.service';
-import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
 import { Router, UrlTree } from '@angular/router';
-import { RequestService } from '../../core/data/request.service';
-import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
-import { RouterStub } from '../../shared/testing/router-stub';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
+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 '../paginated-search-options.model';
-import { RemoteData } from '../../core/data/remote-data';
-import { RequestEntry } from '../../core/data/request.reducer';
-import { getMockRequestService } from '../../shared/mocks/mock-request.service';
-import { FacetConfigSuccessResponse, SearchSuccessResponse } from '../../core/cache/response.models';
-import { SearchQueryResponse } from './search-query-response.model';
-import { SearchFilterConfig } from './search-filter-config.model';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
+import { RemoteData } from '../../data/remote-data';
+import { RequestEntry } from '../../data/request.reducer';
+import { getMockRequestService } from '../../../shared/mocks/mock-request.service';
+import { FacetConfigSuccessResponse, SearchSuccessResponse } from '../../cache/response.models';
+import { SearchQueryResponse } from '../../../shared/search/search-query-response.model';
+import { SearchFilterConfig } from '../../../shared/search/search-filter-config.model';
+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 '../../core/services/route.service';
-import { routeServiceStub } from '../../shared/testing/route-service-stub';
-import { createSuccessfulRemoteDataObject$ } from '../../shared/testing/utils';
+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/testing/utils';
 
 @Component({ template: '' })
 class DummyComponent {
diff --git a/src/app/+search-page/search-service/search.service.ts b/src/app/core/shared/search/search.service.ts
similarity index 74%
rename from src/app/+search-page/search-service/search.service.ts
rename to src/app/core/shared/search/search.service.ts
index d013d9cc64..141f261990 100644
--- a/src/app/+search-page/search-service/search.service.ts
+++ b/src/app/core/shared/search/search.service.ts
@@ -1,47 +1,39 @@
-import { combineLatest as observableCombineLatest, Observable, of as observableOf, zip as observableZip } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf } from 'rxjs';
 import { Injectable, OnDestroy } from '@angular/core';
-import { NavigationExtras, PRIMARY_OUTLET, Router, UrlSegmentGroup } from '@angular/router';
-import { first, map, switchMap, take, tap } from 'rxjs/operators';
-import { RemoteDataBuildService } from '../../core/cache/builders/remote-data-build.service';
-import {
-  FacetConfigSuccessResponse,
-  FacetValueSuccessResponse,
-  SearchSuccessResponse
-} from '../../core/cache/response.models';
-import { PaginatedList } from '../../core/data/paginated-list';
-import { ResponseParsingService } from '../../core/data/parsing.service';
-import { RemoteData } from '../../core/data/remote-data';
-import { GetRequest, RestRequest } from '../../core/data/request.models';
-import { RequestService } from '../../core/data/request.service';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { GenericConstructor } from '../../core/shared/generic-constructor';
-import { HALEndpointService } from '../../core/shared/hal-endpoint.service';
-import {
-  configureRequest,
-  filterSuccessfulResponses,
-  getResponseFromEntry,
-  getSucceededRemoteData
-} from '../../core/shared/operators';
-import { URLCombiner } from '../../core/url-combiner/url-combiner';
-import { hasValue, hasValueOperator, isEmpty, isNotEmpty, isNotUndefined } from '../../shared/empty.util';
-import { NormalizedSearchResult } from '../normalized-search-result.model';
-import { SearchOptions } from '../search-options.model';
-import { SearchResult } from '../search-result.model';
-import { FacetValue } from './facet-value.model';
-import { SearchFilterConfig } from './search-filter-config.model';
-import { SearchResponseParsingService } from '../../core/data/search-response-parsing.service';
-import { SearchQueryResponse } from './search-query-response.model';
-import { PageInfo } from '../../core/shared/page-info.model';
-import { getSearchResultFor } from './search-result-element-decorator';
-import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-import { FacetValueResponseParsingService } from '../../core/data/facet-value-response-parsing.service';
-import { FacetConfigResponseParsingService } from '../../core/data/facet-config-response-parsing.service';
-import { PaginatedSearchOptions } from '../paginated-search-options.model';
-import { Community } from '../../core/shared/community.model';
-import { CommunityDataService } from '../../core/data/community-data.service';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { DSpaceObjectDataService } from '../../core/data/dspace-object-data.service';
-import { RouteService } from '../../core/services/route.service';
+import { NavigationExtras, Router } from '@angular/router';
+import { first, map, switchMap, tap } from 'rxjs/operators';
+import { FacetConfigSuccessResponse, FacetValueSuccessResponse, SearchSuccessResponse } from '../../cache/response.models';
+import { PaginatedList } from '../../data/paginated-list';
+import { ResponseParsingService } from '../../data/parsing.service';
+import { RemoteData } from '../../data/remote-data';
+import { GetRequest, RestRequest } from '../../data/request.models';
+import { RequestService } from '../../data/request.service';
+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, isEmpty, isNotEmpty, isNotUndefined } from '../../../shared/empty.util';
+import { NormalizedSearchResult } from '../../../shared/search/normalized-search-result.model';
+import { SearchOptions } from '../../../shared/search/search-options.model';
+import { SearchResult } from '../../../shared/search/search-result.model';
+import { FacetValue } from '../../../shared/search/facet-value.model';
+import { SearchFilterConfig } from '../../../shared/search/search-filter-config.model';
+import { SearchResponseParsingService } from '../../data/search-response-parsing.service';
+import { SearchQueryResponse } from '../../../shared/search/search-query-response.model';
+import { PageInfo } from '../page-info.model';
+import { getSearchResultFor } from '../../../shared/search/search-result-element-decorator';
+import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
+import { FacetValueResponseParsingService } from '../../data/facet-value-response-parsing.service';
+import { FacetConfigResponseParsingService } from '../../data/facet-config-response-parsing.service';
+import { PaginatedSearchOptions } from '../../../shared/search/paginated-search-options.model';
+import { Community } from '../community.model';
+import { CommunityDataService } from '../../data/community-data.service';
+import { ViewMode } from '../view-mode.model';
+import { DSpaceObjectDataService } from '../../data/dspace-object-data.service';
+import { RemoteDataBuildService } from '../../cache/builders/remote-data-build.service';
+import { configureRequest, filterSuccessfulResponses, getResponseFromEntry, getSucceededRemoteData } from '../operators';
+import { RouteService } from '../../services/route.service';
+import { RequestEntry } from '../../data/request.reducer';
 
 /**
  * Service that performs all general actions that have to do with the search page
@@ -116,6 +108,16 @@ export class SearchService implements OnDestroy {
    * @returns {Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>>} Emits a paginated list with all search results found
    */
   search(searchOptions?: PaginatedSearchOptions, responseMsToLive?: number): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
+    return this.getPaginatedResults(this.searchEntries(searchOptions));
+  }
+
+  /**
+   * Method to retrieve request entries for search results from the server
+   * @param {PaginatedSearchOptions} searchOptions The configuration necessary to perform this search
+   * @param responseMsToLive The amount of milliseconds for the response to live in cache
+   * @returns {Observable<RequestEntry>} Emits an observable with the request entries
+   */
+  searchEntries(searchOptions?: PaginatedSearchOptions, responseMsToLive?: number): Observable<{searchOptions: PaginatedSearchOptions, requestEntry: RequestEntry}> {
 
     const hrefObs = this.getEndpoint(searchOptions);
 
@@ -129,19 +131,35 @@ export class SearchService implements OnDestroy {
 
         return Object.assign(request, {
           responseMsToLive: hasValue(responseMsToLive) ? responseMsToLive : request.responseMsToLive,
-          getResponseParser: getResponseParserFn
+          getResponseParser: getResponseParserFn,
+          searchOptions: searchOptions
         });
       }),
       configureRequest(this.requestService),
     );
-    const requestEntryObs = requestObs.pipe(
-      switchMap((request: RestRequest) => this.requestService.getByHref(request.href))
+    return requestObs.pipe(
+      switchMap((request: RestRequest) => this.requestService.getByHref(request.href)),
+      map(((requestEntry: RequestEntry) => ({
+        searchOptions: searchOptions,
+        requestEntry: requestEntry
+      })))
+    );
+  }
+
+  /**
+   * Method to convert the parsed responses into a paginated list of search results
+   * @param searchEntries: The request entries from the search method
+   * @returns {Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>>} Emits a paginated list with all search results found
+   */
+  getPaginatedResults(searchEntries: Observable<{ searchOptions: PaginatedSearchOptions, requestEntry: RequestEntry }>): Observable<RemoteData<PaginatedList<SearchResult<DSpaceObject>>>> {
+    const requestEntryObs: Observable<RequestEntry> = searchEntries.pipe(
+      map((entry) => entry.requestEntry),
     );
 
     // get search results from response cache
     const sqrObs: Observable<SearchQueryResponse> = requestEntryObs.pipe(
       filterSuccessfulResponses(),
-      map((response: SearchSuccessResponse) => response.results)
+      map((response: SearchSuccessResponse) => response.results),
     );
 
     // turn dspace href from search results to effective list of DSpaceObjects
@@ -187,11 +205,12 @@ export class SearchService implements OnDestroy {
       })
     );
 
-    return observableCombineLatest(hrefObs, tDomainListObs, requestEntryObs).pipe(
-      switchMap(([href, tDomainList, requestEntry]) => {
+    return observableCombineLatest(tDomainListObs, searchEntries).pipe(
+      switchMap(([tDomainList, searchEntry]) => {
+        const requestEntry = searchEntry.requestEntry;
         if (tDomainList.indexOf(undefined) > -1 && requestEntry && requestEntry.completed) {
-          this.requestService.removeByHrefSubstring(href);
-          return this.search(searchOptions)
+          this.requestService.removeByHrefSubstring(requestEntry.request.href);
+          return this.search(searchEntry.searchOptions)
         } else {
           return this.rdb.toRemoteDataObservable(requestEntryObs, payloadObs);
         }
diff --git a/src/app/core/shared/site.model.ts b/src/app/core/shared/site.model.ts
new file mode 100644
index 0000000000..a191b2143f
--- /dev/null
+++ b/src/app/core/shared/site.model.ts
@@ -0,0 +1,11 @@
+import { DSpaceObject } from './dspace-object.model';
+import { ResourceType } from './resource-type';
+
+/**
+ * Model class for the Site object
+ */
+export class Site extends DSpaceObject {
+​
+  static type = new ResourceType('site');
+​
+}
diff --git a/src/app/core/submission/models/submission-object.model.ts b/src/app/core/submission/models/submission-object.model.ts
index 23f75553c5..0b1110fa24 100644
--- a/src/app/core/submission/models/submission-object.model.ts
+++ b/src/app/core/submission/models/submission-object.model.ts
@@ -1,7 +1,6 @@
 import { Observable } from 'rxjs';
 
 import { CacheableObject } from '../../cache/object-cache.reducer';
-import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
 import { DSpaceObject } from '../../shared/dspace-object.model';
 import { EPerson } from '../../eperson/models/eperson.model';
 import { RemoteData } from '../../data/remote-data';
@@ -18,7 +17,7 @@ export interface SubmissionObjectError {
 /**
  * An abstract model class for a SubmissionObject.
  */
-export abstract class SubmissionObject extends DSpaceObject implements CacheableObject, ListableObject {
+export abstract class SubmissionObject extends DSpaceObject implements CacheableObject {
 
   /**
    * The workspaceitem/workflowitem identifier
diff --git a/src/app/core/submission/submission-object-data.service.spec.ts b/src/app/core/submission/submission-object-data.service.spec.ts
new file mode 100644
index 0000000000..b7c06272e6
--- /dev/null
+++ b/src/app/core/submission/submission-object-data.service.spec.ts
@@ -0,0 +1,95 @@
+import { Observable } from 'rxjs';
+import { SubmissionService } from '../../submission/submission.service';
+import { RemoteData } from '../data/remote-data';
+import { SubmissionObject } from './models/submission-object.model';
+import { WorkspaceItem } from './models/workspaceitem.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';
+
+describe('SubmissionObjectDataService', () => {
+  let service: SubmissionObjectDataService;
+  let submissionService: SubmissionService;
+  let workspaceitemDataService: WorkspaceitemDataService;
+  let workflowItemDataService: WorkflowItemDataService;
+
+  const submissionId = '1234';
+  const wsiResult = 'wsiResult' as any;
+  const wfiResult = 'wfiResult' as any;
+
+  beforeEach(() => {
+    workspaceitemDataService = jasmine.createSpyObj('WorkspaceitemDataService', {
+      findById: wsiResult
+    });
+    workflowItemDataService  = jasmine.createSpyObj('WorkflowItemDataService', {
+      findById: wfiResult
+    });
+  });
+
+  describe('findById', () => {
+    it('should call SubmissionService.getSubmissionScope to determine the type of submission object', () => {
+      submissionService = jasmine.createSpyObj('SubmissionService', {
+        getSubmissionScope: {}
+      });
+      service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+      service.findById(submissionId);
+      expect(submissionService.getSubmissionScope).toHaveBeenCalled();
+    });
+
+    describe('when the submission ID refers to a WorkspaceItem', () => {
+      beforeEach(() => {
+        submissionService = jasmine.createSpyObj('SubmissionService', {
+          getSubmissionScope: SubmissionScopeType.WorkspaceItem
+        });
+        service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+      });
+
+      it('should forward the result of WorkspaceitemDataService.findById()', () => {
+        const result = service.findById(submissionId);
+        expect(workspaceitemDataService.findById).toHaveBeenCalledWith(submissionId);
+        expect(result).toBe(wsiResult);
+      });
+    });
+
+    describe('when the submission ID refers to a WorkflowItem', () => {
+      beforeEach(() => {
+        submissionService = jasmine.createSpyObj('SubmissionService', {
+          getSubmissionScope: SubmissionScopeType.WorkflowItem
+        });
+        service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+      });
+
+      it('should forward the result of WorkflowItemDataService.findById()', () => {
+        const result = service.findById(submissionId);
+        expect(workflowItemDataService.findById).toHaveBeenCalledWith(submissionId);
+        expect(result).toBe(wfiResult);
+      });
+    });
+
+    describe('when the type of submission object is unknown', () => {
+      beforeEach(() => {
+        submissionService = jasmine.createSpyObj('SubmissionService', {
+          getSubmissionScope: 'Something else'
+        });
+        service = new SubmissionObjectDataService(workspaceitemDataService, workflowItemDataService, submissionService);
+      });
+
+      it('shouldn\'t call any data service methods', () => {
+        service.findById(submissionId);
+        expect(workspaceitemDataService.findById).not.toHaveBeenCalled();
+        expect(workflowItemDataService.findById).not.toHaveBeenCalled();
+      });
+
+      it('should return a RemoteData containing an error', (done) => {
+        const result = service.findById(submissionId);
+        result.subscribe((rd: RemoteData<SubmissionObject>) => {
+          expect(rd.hasFailed).toBe(true);
+          expect(rd.error).toBeDefined();
+          done();
+        })
+      });
+    });
+
+  });
+});
diff --git a/src/app/core/submission/submission-object-data.service.ts b/src/app/core/submission/submission-object-data.service.ts
new file mode 100644
index 0000000000..15ede18cb8
--- /dev/null
+++ b/src/app/core/submission/submission-object-data.service.ts
@@ -0,0 +1,46 @@
+import { Injectable } from '@angular/core';
+import { of as observableOf, Observable } from 'rxjs';
+import { SubmissionService } from '../../submission/submission.service';
+import { RemoteData } from '../data/remote-data';
+import { RemoteDataError } from '../data/remote-data-error';
+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';
+
+/**
+ * A service to retrieve submission objects (WorkspaceItem/WorkflowItem)
+ * without knowing their type
+ */
+@Injectable({
+  providedIn: 'root'
+})
+export class SubmissionObjectDataService {
+  constructor(
+    private workspaceitemDataService: WorkspaceitemDataService,
+    private workflowItemDataService: WorkflowItemDataService,
+    private submissionService: SubmissionService
+  ) {
+  }
+
+  /**
+   * Retrieve a submission object based on its ID.
+   *
+   * @param id The identifier of a submission object
+   */
+  findById(id: string): Observable<RemoteData<SubmissionObject>> {
+    switch (this.submissionService.getSubmissionScope()) {
+      case SubmissionScopeType.WorkspaceItem:
+        return this.workspaceitemDataService.findById(id);
+      case SubmissionScopeType.WorkflowItem:
+        return this.workflowItemDataService.findById(id);
+      default:
+        const error = new RemoteDataError(
+          undefined,
+          undefined,
+          'The request couldn\'t be sent. Unable to determine the type of submission object'
+        );
+        return observableOf(new RemoteData(false, false, false, error, undefined));
+    }
+  }
+}
diff --git a/src/app/core/submission/submission-response-parsing.service.ts b/src/app/core/submission/submission-response-parsing.service.ts
index da3b578fcd..8bc2971922 100644
--- a/src/app/core/submission/submission-response-parsing.service.ts
+++ b/src/app/core/submission/submission-response-parsing.service.ts
@@ -1,4 +1,6 @@
 import { Inject, 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 { RestRequest } from '../data/request.models';
@@ -76,7 +78,9 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
   protected toCache = false;
 
   constructor(@Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
-              protected objectCache: ObjectCacheService) {
+              protected objectCache: ObjectCacheService,
+              protected dsoParser: DSOResponseParsingService
+  ) {
     super();
   }
 
@@ -88,6 +92,7 @@ export class SubmissionResponseParsingService extends BaseResponseParsingService
    * @returns {RestResponse}
    */
   parse(request: RestRequest, data: DSpaceRESTV2Response): RestResponse {
+    this.dsoParser.parse(deepClone(request), deepClone(data));
     if (isNotEmpty(data.payload)
       && isNotEmpty(data.payload._links)
       && this.isSuccessStatus(data.statusCode)) {
diff --git a/src/app/core/submission/submission-rest.service.spec.ts b/src/app/core/submission/submission-rest.service.spec.ts
index 30fe9f9163..eefc815435 100644
--- a/src/app/core/submission/submission-rest.service.spec.ts
+++ b/src/app/core/submission/submission-rest.service.spec.ts
@@ -59,12 +59,11 @@ describe('SubmissionRestService test suite', () => {
   describe('getDataById', () => {
     it('should configure a new SubmissionRequest', () => {
       const expected = new SubmissionRequest(requestService.generateRequestId(), resourceHref);
-      // set cache time to zero
-      expected.responseMsToLive = 0;
       expected.forceBypassCache = true;
       scheduler.schedule(() => service.getDataById(resourceEndpoint, resourceScope).subscribe());
       scheduler.flush();
 
+      expect(requestService.removeByHrefSubstring).toHaveBeenCalledWith(resourceHref);
       expect(requestService.configure).toHaveBeenCalledWith(expected);
     });
   });
diff --git a/src/app/core/submission/submission-rest.service.ts b/src/app/core/submission/submission-rest.service.ts
index 58aa507314..32ba070002 100644
--- a/src/app/core/submission/submission-rest.service.ts
+++ b/src/app/core/submission/submission-rest.service.ts
@@ -20,6 +20,7 @@ import { HALEndpointService } from '../shared/hal-endpoint.service';
 import { RemoteDataBuildService } from '../cache/builders/remote-data-build.service';
 import { ErrorResponse, RestResponse, SubmissionSuccessResponse } from '../cache/response.models';
 import { getResponseFromEntry } from '../shared/operators';
+import {URLCombiner} from '../url-combiner/url-combiner';
 
 /**
  * The service handling all submission REST requests
@@ -65,9 +66,15 @@ export class SubmissionRestService {
    *    The base endpoint for the type of object
    * @param resourceID
    *    The identifier for the object
+   * @param collectionId
+   *    The owning collection for the object
    */
-  protected getEndpointByIDHref(endpoint, resourceID): string {
-    return isNotEmpty(resourceID) ? `${endpoint}/${resourceID}` : `${endpoint}`;
+  protected getEndpointByIDHref(endpoint, resourceID, collectionId?: string): string {
+    let url = isNotEmpty(resourceID) ? `${endpoint}/${resourceID}` : `${endpoint}`;
+    if (collectionId) {
+      url = new URLCombiner(url, `?owningCollection=${collectionId}`).toString();
+    }
+    return url;
   }
 
   /**
@@ -109,11 +116,10 @@ export class SubmissionRestService {
       filter((href: string) => isNotEmpty(href)),
       distinctUntilChanged(),
       map((endpointURL: string) => new SubmissionRequest(requestId, endpointURL)),
-      map ((request: RestRequest) => {
-        request.responseMsToLive = 0;
-        return request;
+      tap((request: RestRequest) => {
+        this.requestService.removeByHrefSubstring(request.href);
+        this.requestService.configure(request);
       }),
-      tap((request: RestRequest) => this.requestService.configure(request)),
       flatMap(() => this.fetchRequest(requestId)),
       distinctUntilChanged());
   }
@@ -131,12 +137,14 @@ export class SubmissionRestService {
    *    The [HttpOptions] object
    * @return Observable<SubmitDataResponseDefinitionObject>
    *     server response
+   * @param collectionId
+   *    The owning collection id
    */
-  public postToEndpoint(linkName: string, body: any, scopeId?: string, options?: HttpOptions): Observable<SubmitDataResponseDefinitionObject> {
+  public postToEndpoint(linkName: string, body: any, scopeId?: string, options?: HttpOptions, collectionId?: string): Observable<SubmitDataResponseDefinitionObject> {
     const requestId = this.requestService.generateRequestId();
     return this.halService.getEndpoint(linkName).pipe(
       filter((href: string) => isNotEmpty(href)),
-      map((endpointURL: string) => this.getEndpointByIDHref(endpointURL, scopeId)),
+      map((endpointURL: string) => this.getEndpointByIDHref(endpointURL, scopeId, collectionId)),
       distinctUntilChanged(),
       map((endpointURL: string) => new SubmissionPostRequest(requestId, endpointURL, body, options)),
       tap((request: PostRequest) => this.requestService.configure(request)),
diff --git a/src/app/core/submission/workflowitem-data.service.ts b/src/app/core/submission/workflowitem-data.service.ts
index 43c4aecafe..47195ed0a1 100644
--- a/src/app/core/submission/workflowitem-data.service.ts
+++ b/src/app/core/submission/workflowitem-data.service.ts
@@ -8,7 +8,7 @@ import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
 import { WorkflowItem } from './models/workflowitem.model';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FindAllOptions } from '../data/request.models';
+import { FindListOptions } from '../data/request.models';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -35,7 +35,7 @@ export class WorkflowItemDataService extends DataService<WorkflowItem> {
     super();
   }
 
-  public getBrowseEndpoint(options: FindAllOptions) {
+  public getBrowseEndpoint(options: FindListOptions) {
     return this.halService.getEndpoint(this.linkPath);
   }
 
diff --git a/src/app/core/submission/workspaceitem-data.service.ts b/src/app/core/submission/workspaceitem-data.service.ts
index 4d388ec513..3f782b74a2 100644
--- a/src/app/core/submission/workspaceitem-data.service.ts
+++ b/src/app/core/submission/workspaceitem-data.service.ts
@@ -7,7 +7,7 @@ import { CoreState } from '../core.reducers';
 import { DataService } from '../data/data.service';
 import { RequestService } from '../data/request.service';
 import { HALEndpointService } from '../shared/hal-endpoint.service';
-import { FindAllOptions } from '../data/request.models';
+import { FindListOptions } from '../data/request.models';
 import { NormalizedObjectBuildService } from '../cache/builders/normalized-object-build.service';
 import { NotificationsService } from '../../shared/notifications/notifications.service';
 import { ObjectCacheService } from '../cache/object-cache.service';
@@ -35,7 +35,7 @@ export class WorkspaceitemDataService extends DataService<WorkspaceItem> {
     super();
   }
 
-  public getBrowseEndpoint(options: FindAllOptions) {
+  public getBrowseEndpoint(options: FindListOptions) {
     return this.halService.getEndpoint(this.linkPath);
   }
 
diff --git a/src/app/core/tasks/models/task-object.model.ts b/src/app/core/tasks/models/task-object.model.ts
index 14dbbd7301..1f37548b04 100644
--- a/src/app/core/tasks/models/task-object.model.ts
+++ b/src/app/core/tasks/models/task-object.model.ts
@@ -2,17 +2,16 @@ import { Observable } from 'rxjs';
 
 import { CacheableObject } from '../../cache/object-cache.reducer';
 import { DSpaceObject } from '../../shared/dspace-object.model';
-import { ListableObject } from '../../../shared/object-collection/shared/listable-object.model';
 import { RemoteData } from '../../data/remote-data';
 import { WorkflowItem } from '../../submission/models/workflowitem.model';
-import { Group } from '../../eperson/models/group.model';
-import { EPerson } from '../../eperson/models/eperson.model';
 import { ResourceType } from '../../shared/resource-type';
+import { EPerson } from '../../eperson/models/eperson.model';
+import { Group } from '../../eperson/models/group.model';
 
 /**
  * An abstract model class for a TaskObject.
  */
-export class TaskObject extends DSpaceObject implements CacheableObject, ListableObject {
+export class TaskObject extends DSpaceObject implements CacheableObject {
   static type = new ResourceType('taskobject');
 
   /**
diff --git a/src/app/core/tasks/tasks.service.ts b/src/app/core/tasks/tasks.service.ts
index f39b144c6a..cf23bfd74b 100644
--- a/src/app/core/tasks/tasks.service.ts
+++ b/src/app/core/tasks/tasks.service.ts
@@ -4,7 +4,7 @@ import { merge as observableMerge, Observable, of as observableOf } from 'rxjs';
 import { distinctUntilChanged, filter, flatMap, map, mergeMap, tap } from 'rxjs/operators';
 
 import { DataService } from '../data/data.service';
-import { DeleteRequest, FindAllOptions, PostRequest, TaskDeleteRequest, TaskPostRequest } from '../data/request.models';
+import { DeleteRequest, FindListOptions, PostRequest, TaskDeleteRequest, TaskPostRequest } from '../data/request.models';
 import { isNotEmpty } from '../../shared/empty.util';
 import { HttpOptions } from '../dspace-rest-v2/dspace-rest-v2.service';
 import { ProcessTaskResponse } from './models/process-task-response';
@@ -18,7 +18,7 @@ import { CacheableObject } from '../cache/object-cache.reducer';
  */
 export abstract class TasksService<T extends CacheableObject> extends DataService<T> {
 
-  public getBrowseEndpoint(options: FindAllOptions): Observable<string> {
+  public getBrowseEndpoint(options: FindListOptions): Observable<string> {
     return this.halService.getEndpoint(this.linkPath);
   }
 
diff --git a/src/app/core/utilities/equals.decorators.ts b/src/app/core/utilities/equals.decorators.ts
new file mode 100644
index 0000000000..6fdbd40c0f
--- /dev/null
+++ b/src/app/core/utilities/equals.decorators.ts
@@ -0,0 +1,71 @@
+import { isEmpty } from '../../shared/empty.util';
+import { GenericConstructor } from '../shared/generic-constructor';
+import { EquatableObject } from './equatable';
+
+const excludedFromEquals = new Map();
+const fieldsForEqualsMap = new Map();
+
+/**
+ * Decorator function that adds the equatable settings from the given (parent) object
+ * @param parentCo The constructor of the parent object
+ */
+export function inheritEquatable(parentCo: GenericConstructor<EquatableObject<any>>) {
+  return function decorator(childCo: GenericConstructor<EquatableObject<any>>) {
+    const parentExcludedFields = getExcludedFromEqualsFor(parentCo) || [];
+    const excludedFields = getExcludedFromEqualsFor(childCo) || [];
+    excludedFromEquals.set(childCo, [...excludedFields, ...parentExcludedFields]);
+
+    const mappedFields = fieldsForEqualsMap.get(childCo) || new Map();
+    const parentMappedFields = fieldsForEqualsMap.get(parentCo) || new Map();
+    Array.from(parentMappedFields.keys())
+      .filter((key) => !Array.from(mappedFields.keys()).includes(key))
+      .forEach((key) => {
+        fieldsForEquals(...parentMappedFields.get(key))(new childCo(), key);
+      });
+  }
+}
+
+/**
+ * Function to mark properties as excluded from the equals method
+ * @param object The object to exclude the property for
+ * @param propertyName The name of the property to exclude
+ */
+export function excludeFromEquals(object: any, propertyName: string): any {
+  if (!object) {
+    return;
+  }
+  let list = excludedFromEquals.get(object.constructor);
+  if (isEmpty(list)) {
+    list = [];
+  }
+  excludedFromEquals.set(object.constructor, [...list, propertyName]);
+}
+
+// tslint:disable-next-line:ban-types
+export function getExcludedFromEqualsFor(constructor: Function): string[] {
+  return excludedFromEquals.get(constructor) || [];
+}
+
+/**
+ * Function to save the fields that are to be used for a certain property in the equals method for the given object
+ * @param fields The fields to use to equate the property of the object
+ */
+export function fieldsForEquals(...fields: string[]): any {
+  return function i(object: any, propertyName: string): any {
+    if (!object) {
+      return;
+    }
+    let fieldMap = fieldsForEqualsMap.get(object.constructor);
+    if (isEmpty(fieldMap)) {
+      fieldMap = new Map();
+    }
+    fieldMap.set(propertyName, fields);
+    fieldsForEqualsMap.set(object.constructor, fieldMap);
+  }
+}
+
+// tslint:disable-next-line:ban-types
+export function getFieldsForEquals(constructor: Function, field: string): string[] {
+  const fieldMap = fieldsForEqualsMap.get(constructor) || new Map();
+  return fieldMap.get(field);
+}
diff --git a/src/app/core/utilities/equatable.spec.ts b/src/app/core/utilities/equatable.spec.ts
new file mode 100644
index 0000000000..79136cd221
--- /dev/null
+++ b/src/app/core/utilities/equatable.spec.ts
@@ -0,0 +1,113 @@
+import { excludeFromEquals, fieldsForEquals } from './equals.decorators';
+import { EquatableObject } from './equatable';
+import { cloneDeep } from 'lodash';
+
+class Dog extends EquatableObject<Dog> {
+  public name: string;
+
+  @excludeFromEquals
+  public ballsCaught: number;
+
+  public owner: Owner;
+
+  @fieldsForEquals('name')
+  public favouriteToy: { name: string, colour: string };
+}
+
+// tslint:disable-next-line:max-classes-per-file
+class Owner extends EquatableObject<Owner> {
+  @excludeFromEquals
+  favouriteFood: string;
+
+  constructor(
+    public name: string,
+    public age: number,
+    favouriteFood: string
+  ) {
+    super();
+    this.favouriteFood = favouriteFood;
+  }
+
+}
+
+describe('equatable', () => {
+  let dogRoger: Dog;
+  let dogMissy: Dog;
+
+  beforeEach(() => {
+    dogRoger = new Dog();
+    dogRoger.name = 'Roger';
+    dogRoger.ballsCaught = 6;
+    dogRoger.owner = new Owner('Tommy', 16, 'spaghetti');
+    dogRoger.favouriteToy = { name: 'Twinky', colour: 'red' };
+
+    dogMissy = new Dog();
+    dogMissy.name = 'Missy';
+    dogMissy.ballsCaught = 9;
+    dogMissy.owner = new Owner('Jenny', 29, 'pizza');
+    dogRoger.favouriteToy = { name: 'McSqueak', colour: 'grey' };
+  });
+
+  it('should return false when the other object is undefined', () => {
+    const isEqual = dogRoger.equals(undefined);
+    expect(isEqual).toBe(false);
+  });
+
+  it('should return true when the other object is the exact same object', () => {
+    const isEqual = dogRoger.equals(dogRoger);
+    expect(isEqual).toBe(true);
+  });
+
+  it('should return true when the other object is an exact copy of the first one', () => {
+    const copyOfDogRoger = cloneDeep(dogRoger);
+    const isEqual = dogRoger.equals(copyOfDogRoger);
+    expect(isEqual).toBe(true);
+  });
+
+  it('should return false when the other object differs in all fields', () => {
+    const isEqual = dogRoger.equals(dogMissy);
+    expect(isEqual).toBe(false);
+  });
+
+  it('should return true when the other object only differs in fields that are marked as excludeFromEquals', () => {
+    const copyOfDogRoger = cloneDeep(dogRoger);
+    copyOfDogRoger.ballsCaught = 4;
+    const isEqual = dogRoger.equals(copyOfDogRoger);
+    expect(isEqual).toBe(true);
+  });
+
+  it('should return false when the other object differs in fields that are not marked as excludeFromEquals', () => {
+    const copyOfDogRoger = cloneDeep(dogRoger);
+    copyOfDogRoger.name = 'Elliot';
+    const isEqual = dogRoger.equals(copyOfDogRoger);
+    expect(isEqual).toBe(false);
+  });
+
+  it('should return true when the other object\'s nested object only differs in fields that are marked as excludeFromEquals, when the nested object is not marked decorated with @fieldsForEquals', () => {
+    const copyOfDogRoger = cloneDeep(dogRoger);
+    copyOfDogRoger.owner.favouriteFood = 'Sushi';
+    const isEqual = dogRoger.equals(copyOfDogRoger);
+    expect(isEqual).toBe(true);
+  });
+
+  it('should return false when the other object\'s nested object differs in fields that are not marked as excludeFromEquals, when the nested object is not marked decorated with @fieldsForEquals', () => {
+    const copyOfDogRoger = cloneDeep(dogRoger);
+    copyOfDogRoger.owner.age = 36;
+    const isEqual = dogRoger.equals(copyOfDogRoger);
+    expect(isEqual).toBe(false);
+  });
+
+  it('should return true when the other object\'s nested object does not differ in fields that are listed inside the nested @fieldsForEquals decorator', () => {
+    const copyOfDogRoger = cloneDeep(dogRoger);
+    copyOfDogRoger.favouriteToy.colour = 'green';
+    const isEqual = dogRoger.equals(copyOfDogRoger);
+    expect(isEqual).toBe(true);
+  });
+
+  it('should return false when the other object\'s nested object differs in fields that are listed inside the nested @fieldsForEquals decorator', () => {
+    const copyOfDogRoger = cloneDeep(dogRoger);
+    copyOfDogRoger.favouriteToy.name = 'Mister Bone';
+    const isEqual = dogRoger.equals(copyOfDogRoger);
+    expect(isEqual).toBe(false);
+  });
+});
diff --git a/src/app/core/utilities/equatable.ts b/src/app/core/utilities/equatable.ts
new file mode 100644
index 0000000000..e022297229
--- /dev/null
+++ b/src/app/core/utilities/equatable.ts
@@ -0,0 +1,52 @@
+import { getExcludedFromEqualsFor, getFieldsForEquals } from './equals.decorators';
+import { hasNoValue, hasValue } from '../../shared/empty.util';
+
+/**
+ * Method to compare fields of two objects against each other
+ * @param object1 The first object for the comparison
+ * @param object2 The second object for the comparison
+ * @param fieldList The list of property/field names to compare
+ */
+function equalsByFields(object1, object2, fieldList): boolean {
+  const unequalProperty = fieldList.find((key) => {
+    if (object1[key] === object2[key]) {
+      return false;
+    }
+    if (hasNoValue(object1[key]) && hasNoValue(object2[key])) {
+      return false;
+    }
+    if (hasNoValue(object1[key]) || hasNoValue(object2[key])) {
+      return true;
+    }
+    const mapping = getFieldsForEquals(object1.constructor, key);
+    if (hasValue(mapping)) {
+      return !equalsByFields(object1[key], object2[key], mapping);
+    }
+    if (object1[key] instanceof EquatableObject) {
+      return !object1[key].equals(object2[key]);
+    }
+    if (typeof object1[key] === 'object') {
+      return !equalsByFields(object1[key], object2[key], Object.keys(object1))
+    }
+    return object1[key] !== object2[key];
+  });
+  return hasNoValue(unequalProperty);
+}
+
+/**
+ * Abstract class to represent objects that can be compared to each other
+ * It provides a default way of comparing
+ */
+export abstract class EquatableObject<T> {
+  equals(other: T): boolean {
+    if (hasNoValue(other)) {
+      return false;
+    }
+    if (this as any === other) {
+      return true;
+    }
+    const excludedKeys = getExcludedFromEqualsFor(this.constructor);
+    const keys = Object.keys(this).filter((key) => !excludedKeys.includes(key));
+    return equalsByFields(this, other, keys);
+  }
+}
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 641a0d2238..5a5bfde49e 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,8 +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 { 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';
 
 @listableObjectComponent('JournalVolume', ViewMode.ListElement)
 @Component({
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 6f1cbf9923..9be8a1f4e9 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,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
-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';
 
 @listableObjectComponent('JournalIssue', ViewMode.StandalonePage)
 @Component({
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 4219609aab..ee90dd8f5a 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,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
-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';
 
 @listableObjectComponent('JournalVolume', ViewMode.StandalonePage)
 @Component({
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 ae6c3a8914..e86ab35e0e 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
@@ -36,8 +36,11 @@
     </div>
   </div>
   <div class="mt-5 w-100">
-    <ds-related-entities-search [item]="object"
-      [relationType]="'isJournalOfPublication'">
-    </ds-related-entities-search>
+    <ds-tabbed-related-entities-search  [item]="object"
+                                        [relationTypes]="[{
+                                          label: 'isJournalOfPublication',
+                                          filter: 'isJournalOfPublication'
+                                        }]">
+    </ds-tabbed-related-entities-search>
   </div>
 </div>
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 a475e16637..39d7d9ccce 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
@@ -13,6 +13,7 @@ import { isNotEmpty } from '../../../../shared/empty.util';
 import { JournalComponent } from './journal.component';
 import { GenericItemPageFieldComponent } from '../../../../+item-page/simple/field-components/specific-field/generic/generic-item-page-field.component';
 import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+import { RelationshipService } from '../../../../core/data/relationship.service';
 
 let comp: JournalComponent;
 let fixture: ComponentFixture<JournalComponent>;
@@ -53,7 +54,8 @@ describe('JournalComponent', () => {
       declarations: [JournalComponent, GenericItemPageFieldComponent, TruncatePipe],
       providers: [
         {provide: ItemDataService, useValue: {}},
-        {provide: TruncatableService, useValue: {}}
+        {provide: TruncatableService, useValue: {}},
+        {provide: RelationshipService, useValue: {}}
       ],
 
       schemas: [NO_ERRORS_SCHEMA]
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 dbbeb81662..605bd52238 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,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
-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';
 
 @listableObjectComponent('Journal', ViewMode.StandalonePage)
 @Component({
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 4d97868b58..1b23d567f5 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
@@ -24,16 +24,6 @@
     </ds-generic-item-page-field>
   </div>
   <div class="col-xs-12 col-md-6">
-    <ds-related-items
-      [parentItem]="object"
-      [relationType]="'isPersonOfOrgUnit'"
-      [label]="'relationships.isPersonOf' | translate">
-    </ds-related-items>
-    <ds-related-items
-      [parentItem]="object"
-      [relationType]="'isProjectOfOrgUnit'"
-      [label]="'relationships.isProjectOf' | translate">
-    </ds-related-items>
     <ds-related-items
       [parentItem]="object"
       [relationType]="'isPublicationOfOrgUnit'"
@@ -49,4 +39,18 @@
       </a>
     </div>
   </div>
+  <div class="mt-5 w-100">
+    <ds-tabbed-related-entities-search  [item]="object"
+                                        [relationTypes]="[{
+                                          label: 'isOrgUnitOfPerson',
+                                          filter: 'isOrgUnitOfPerson',
+                                          configuration: 'person'
+                                        },
+                                        {
+                                          label: 'isOrgUnitOfProject',
+                                          filter: 'isOrgUnitOfProject',
+                                          configuration: 'project'
+                                        }]">
+    </ds-tabbed-related-entities-search>
+  </div>
 </div>
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 d9d4461bfa..6df2d87503 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,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
-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';
 
 @listableObjectComponent('OrgUnit', ViewMode.StandalonePage)
 @Component({
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 ff675ab057..97a3cf416e 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
@@ -53,8 +53,11 @@
     </div>
   </div>
   <div class="mt-5 w-100">
-    <ds-related-entities-search [item]="object"
-      [relationType]="'isAuthorOfPublication'">
-    </ds-related-entities-search>
+    <ds-tabbed-related-entities-search  [item]="object"
+                                        [relationTypes]="[{
+                                          label: 'isAuthorOfPublication',
+                                          filter: 'isAuthorOfPublication'
+                                        }]">
+    </ds-tabbed-related-entities-search>
   </div>
 </div>
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 15c7184702..9972736b95 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,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
-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';
 
 @listableObjectComponent('Person', ViewMode.StandalonePage)
 @Component({
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 8ac424af5b..4e432e869e 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,7 +1,7 @@
 import { Component } from '@angular/core';
 import { ItemComponent } from '../../../../+item-page/simple/item-types/shared/item.component';
-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';
 
 @listableObjectComponent('Project', ViewMode.StandalonePage)
 @Component({
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..867b5890eb 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,4 +1,4 @@
-import { Component } from '@angular/core';
+import { Component, OnInit } 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';
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 8829318f34..cef3b4539b 100644
--- a/src/app/entity-groups/research-entities/research-entities.module.ts
+++ b/src/app/entity-groups/research-entities/research-entities.module.ts
@@ -20,6 +20,12 @@ import { OrgUnitSearchResultGridElementComponent } from './item-grid-elements/se
 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 { 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';
 
 const ENTRY_COMPONENTS = [
   OrgUnitComponent,
@@ -38,7 +44,13 @@ const ENTRY_COMPONENTS = [
   ProjectSearchResultListElementComponent,
   PersonSearchResultGridElementComponent,
   OrgUnitSearchResultGridElementComponent,
-  ProjectSearchResultGridElementComponent
+  ProjectSearchResultGridElementComponent,
+  PersonSearchResultListSubmissionElementComponent,
+  PersonInputSuggestionsComponent,
+  NameVariantModalComponent,
+  OrgUnitSearchResultListSubmissionElementComponent,
+  OrgUnitInputSuggestionsComponent,
+  ExternalSourceEntryListSubmissionElementComponent
 ];
 
 @NgModule({
@@ -49,7 +61,7 @@ const ENTRY_COMPONENTS = [
     ItemPageModule
   ],
   declarations: [
-    ...ENTRY_COMPONENTS
+    ...ENTRY_COMPONENTS,
   ],
   entryComponents: [
     ...ENTRY_COMPONENTS
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
new file mode 100644
index 0000000000..55b8f38a5e
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.html
@@ -0,0 +1,2 @@
+<div>{{object.display}}</div>
+<div *ngIf="uri"><a target="_blank" [href]="uri.value">{{uri.value}}</a></div>
diff --git a/src/app/+search-page/search-filters/search-filters.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.scss
similarity index 100%
rename from src/app/+search-page/search-filters/search-filters.component.scss
rename to src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.scss
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
new file mode 100644
index 0000000000..fa153b8c5e
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.spec.ts
@@ -0,0 +1,47 @@
+import { ExternalSourceEntryListSubmissionElementComponent } from './external-source-entry-list-submission-element.component';
+import { async, 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';
+
+describe('ExternalSourceEntryListSubmissionElementComponent', () => {
+  let component: ExternalSourceEntryListSubmissionElementComponent;
+  let fixture: ComponentFixture<ExternalSourceEntryListSubmissionElementComponent>;
+
+  const uri = 'https://orcid.org/0001-0001-0001-0001';
+  const entry = Object.assign(new ExternalSourceEntry(), {
+    id: '0001-0001-0001-0001',
+    display: 'John Doe',
+    value: 'John, Doe',
+    metadata: {
+      'dc.identifier.uri': [
+        {
+          value: uri
+        }
+      ]
+    }
+  });
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ExternalSourceEntryListSubmissionElementComponent],
+      imports: [TranslateModule.forRoot()],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ExternalSourceEntryListSubmissionElementComponent);
+    component = fixture.componentInstance;
+    component.object = entry;
+    fixture.detectChanges();
+  });
+
+  it('should display the entry\'s display value', () => {
+    expect(fixture.nativeElement.textContent).toContain(entry.display);
+  });
+
+  it('should display the entry\'s uri', () => {
+    expect(fixture.nativeElement.textContent).toContain(uri);
+  });
+});
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
new file mode 100644
index 0000000000..c0512b4995
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/external-source-entry/external-source-entry-list-submission-element.component.ts
@@ -0,0 +1,28 @@
+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 { Context } from '../../../../../core/shared/context.model';
+import { Component, OnInit } from '@angular/core';
+import { Metadata } from '../../../../../core/shared/metadata.utils';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+
+@listableObjectComponent(ExternalSourceEntry, ViewMode.ListElement, Context.SubmissionModal)
+@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'
+})
+/**
+ * The component for displaying a list element of an external source entry
+ */
+export class ExternalSourceEntryListSubmissionElementComponent extends AbstractListableElementComponent<ExternalSourceEntry> implements OnInit {
+  /**
+   * The metadata value for the object's uri
+   */
+  uri: MetadataValue;
+
+  ngOnInit(): void {
+    this.uri = Metadata.first(this.object.metadata, 'dc.identifier.uri');
+  }
+}
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
new file mode 100644
index 0000000000..b0fa714371
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.html
@@ -0,0 +1,19 @@
+<div class="d-flex">
+    <div class="person-thumbnail pr-2">
+        <ds-thumbnail [thumbnail]="dso.getThumbnail() | async" [defaultImage]="'assets/images/orgunit-placeholder.svg'"></ds-thumbnail>
+    </div>
+    <div class="flex-grow-1">
+        <ds-org-unit-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)"
+                                       (submitSuggestion)="selectCustom($event)"></ds-org-unit-input-suggestions>
+        <span class="text-muted">
+        <span *ngIf="dso.allMetadata('organization.address.addressLocality').length > 0"
+              class="item-list-address-locality">
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressLocality'])"></span></span><span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0">, </span>
+        </span>
+        <span *ngIf="dso.allMetadata('organization.address.addressCountry').length > 0"
+              class="item-list-address-country">
+                    <span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"><span [innerHTML]="firstMetadataValue(['organization.address.addressCountry'])"></span></span>
+        </span>
+        </span>
+    </div>
+</div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.scss
new file mode 100644
index 0000000000..8fc6d2138d
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.scss
@@ -0,0 +1,7 @@
+@import '../../../../../../styles/variables';
+
+$submission-relationship-thumbnail-width: 80px;
+
+.person-thumbnail {
+    width: $submission-relationship-thumbnail-width;
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..2a77b64f43
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.spec.ts
@@ -0,0 +1,154 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { of as observableOf } from 'rxjs';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { OrgUnitSearchResultListSubmissionElementComponent } from './org-unit-search-result-list-submission-element.component';
+import { Item } from '../../../../../core/shared/item.model';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { ItemDataService } from '../../../../../core/data/item-data.service';
+import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
+import { Store } from '@ngrx/store';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/testing/utils';
+import { PaginatedList } from '../../../../../core/data/paginated-list';
+
+let personListElementComponent: OrgUnitSearchResultListSubmissionElementComponent;
+let fixture: ComponentFixture<OrgUnitSearchResultListSubmissionElementComponent>;
+
+let mockItemWithMetadata: ItemSearchResult;
+let mockItemWithoutMetadata: ItemSearchResult;
+
+let nameVariant;
+let mockRelationshipService;
+
+function init() {
+  mockItemWithMetadata = Object.assign(
+    new ItemSearchResult(),
+    {
+      indexableObject: Object.assign(new Item(), {
+        bundles: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [])),
+        metadata: {
+          'dc.title': [
+            {
+              language: 'en_US',
+              value: 'This is just another title'
+            }
+          ],
+          'organization.address.addressLocality': [
+            {
+              language: 'en_US',
+              value: 'Europe'
+            }
+          ],
+          'organization.address.addressCountry': [
+            {
+              language: 'en_US',
+              value: 'Belgium'
+            }
+          ]
+        }
+      })
+    });
+  mockItemWithoutMetadata = Object.assign(
+    new ItemSearchResult(),
+    {
+      indexableObject: Object.assign(new Item(), {
+        bundles: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [])),
+        metadata: {
+          'dc.title': [
+            {
+              language: 'en_US',
+              value: 'This is just another title'
+            }
+          ]
+        }
+      })
+    });
+
+  nameVariant = 'Doe J.';
+  mockRelationshipService = {
+    getNameVariant: () => observableOf(nameVariant)
+  };
+}
+
+describe('OrgUnitSearchResultListSubmissionElementComponent', () => {
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [OrgUnitSearchResultListSubmissionElementComponent, TruncatePipe],
+      providers: [
+        { provide: TruncatableService, useValue: {} },
+        { provide: RelationshipService, useValue: mockRelationshipService },
+        { provide: NotificationsService, useValue: {} },
+        { provide: TranslateService, useValue: {} },
+        { provide: NgbModal, useValue: {} },
+        { provide: ItemDataService, useValue: {} },
+        { provide: SelectableListService, useValue: {} },
+        { provide: Store, useValue: {} }
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(OrgUnitSearchResultListSubmissionElementComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default }
+    }).compileComponents();
+  }));
+
+  beforeEach(async(() => {
+    fixture = TestBed.createComponent(OrgUnitSearchResultListSubmissionElementComponent);
+    personListElementComponent = fixture.componentInstance;
+
+  }));
+
+  describe('When the item has a address locality span', () => {
+    beforeEach(() => {
+      personListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should show the address locality span', () => {
+      const jobTitleField = fixture.debugElement.query(By.css('span.item-list-address-locality'));
+      expect(jobTitleField).not.toBeNull();
+    });
+  });
+
+  describe('When the item has no address locality', () => {
+    beforeEach(() => {
+      personListElementComponent.object = mockItemWithoutMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not show the address locality span', () => {
+      const jobTitleField = fixture.debugElement.query(By.css('span.item-list-address-locality'));
+      expect(jobTitleField).toBeNull();
+    });
+  });
+
+  describe('When the item has a address country span', () => {
+    beforeEach(() => {
+      personListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should show the address country span', () => {
+      const jobTitleField = fixture.debugElement.query(By.css('span.item-list-address-country'));
+      expect(jobTitleField).not.toBeNull();
+    });
+  });
+
+  describe('When the item has no address country', () => {
+    beforeEach(() => {
+      personListElementComponent.object = mockItemWithoutMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not show the address country span', () => {
+      const jobTitleField = fixture.debugElement.query(By.css('span.item-list-address-country'));
+      expect(jobTitleField).toBeNull();
+    });
+  });
+});
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
new file mode 100644
index 0000000000..cbddb8d6f9
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-search-result-list-submission-element.component.ts
@@ -0,0 +1,98 @@
+import { Component, OnInit } from '@angular/core';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+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 { RelationshipService } from '../../../../../core/data/relationship.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 { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
+import { NameVariantModalComponent } from '../../name-variant-modal/name-variant-modal.component';
+
+@listableObjectComponent('OrgUnitSearchResult', ViewMode.ListElement, Context.SubmissionModal)
+@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'
+})
+
+/**
+ * The component for displaying a list element for an item search result of the type OrgUnit
+ */
+export class OrgUnitSearchResultListSubmissionElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> implements OnInit {
+  allSuggestions: string[];
+  selectedName: string;
+  alternativeField = 'dc.title.alternative';
+
+  constructor(protected truncatableService: TruncatableService,
+              private relationshipService: RelationshipService,
+              private notificationsService: NotificationsService,
+              private translateService: TranslateService,
+              private modalService: NgbModal,
+              private itemDataService: ItemDataService,
+              private selectableListService: SelectableListService) {
+    super(truncatableService);
+  }
+
+  ngOnInit() {
+    super.ngOnInit();
+    const defaultValue = this.firstMetadataValue('organization.legalName');
+    const alternatives = this.allMetadataValues(this.alternativeField);
+    this.allSuggestions = [defaultValue, ...alternatives];
+
+    this.relationshipService.getNameVariant(this.listID, this.dso.uuid)
+      .pipe(take(1))
+      .subscribe((nameVariant: string) => {
+          this.selectedName = nameVariant || defaultValue;
+        }
+      );
+  }
+
+  select(value) {
+    this.selectableListService.isObjectSelected(this.listID, this.object)
+      .pipe(take(1))
+      .subscribe((selected) => {
+        if (!selected) {
+          this.selectableListService.selectSingle(this.listID, this.object);
+        }
+      });
+    this.relationshipService.setNameVariant(this.listID, this.dso.uuid, value);
+  }
+
+  selectCustom(value) {
+    if (!this.allSuggestions.includes(value)) {
+      this.openModal(value)
+        .then(() => {
+
+          const newName: MetadataValue = new MetadataValue();
+          newName.value = value;
+
+          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
+              },
+            });
+          this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
+        })
+    }
+    this.select(value);
+  }
+
+  openModal(value): Promise<any> {
+    const modalRef = this.modalService.open(NameVariantModalComponent, { centered: true });
+    const modalComp = modalRef.componentInstance;
+    modalComp.value = value;
+    return modalRef.result;
+  }
+}
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
new file mode 100644
index 0000000000..e177b2b561
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.html
@@ -0,0 +1,24 @@
+<form #form="ngForm" (ngSubmit)="onSubmit(value)"
+      [action]="action" (keydown)="onKeydown($event)"
+      (keydown.arrowdown)="shiftFocusDown($event)"
+      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+      (dsClickOutside)="close();">
+    <input #inputField type="text" [(ngModel)]="value" [name]="name"
+           class="form-control suggestion_input"
+           (focus)="open()"
+           (click)="open()"
+           [ngClass]="{'is-invalid': !valid}"
+           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+           [placeholder]="placeholder"
+           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+    <input type="submit" class="d-none"/>
+    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+        <div class="dropdown-list">
+            <div *ngFor="let suggestionOption of suggestions">
+                <a href="#" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+                    <span [innerHTML]="suggestionOption"></span>
+                </a>
+            </div>
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
new file mode 100644
index 0000000000..8301e12c5f
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.scss
@@ -0,0 +1,18 @@
+form {
+    z-index: 1;
+    &:before {
+        position: absolute;
+        font-weight: 900;
+        font-family: "Font Awesome 5 Free";
+        content: "\f0d7";
+        top: 7px;
+        right: 0;
+        height: 20px;
+        width: 20px;
+        z-index: -1;
+    }
+
+    input.suggestion_input {
+        background: transparent;
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..34b89cc8aa
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.spec.ts
@@ -0,0 +1,64 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { OrgUnitInputSuggestionsComponent } from './org-unit-input-suggestions.component';
+import { FormsModule } from '@angular/forms';
+
+let component: OrgUnitInputSuggestionsComponent;
+let fixture: ComponentFixture<OrgUnitInputSuggestionsComponent>;
+
+let suggestions: string[];
+let testValue;
+
+function init() {
+  suggestions = ['test', 'suggestion', 'example']
+  testValue = 'bla';
+}
+
+describe('OrgUnitInputSuggestionsComponent', () => {
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [OrgUnitInputSuggestionsComponent],
+      imports: [
+        FormsModule,
+      ],
+      providers: [
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(OrgUnitInputSuggestionsComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default }
+    }).compileComponents();
+  }));
+
+  beforeEach(async(() => {
+    fixture = TestBed.createComponent(OrgUnitInputSuggestionsComponent);
+    component = fixture.componentInstance;
+    component.suggestions = suggestions;
+    fixture.detectChanges();
+  }));
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('When the component is initialized', () => {
+    it('should set the value to the first value of the suggestions', () => {
+      expect(component.value).toEqual('test');
+    });
+  });
+
+  describe('When onSubmit is called', () => {
+    it('should set the value to parameter of the method', () => {
+      component.onSubmit(testValue);
+      expect(component.value).toEqual(testValue);
+    });
+  });
+
+  describe('When onClickSuggestion is called', () => {
+    it('should set the value to parameter of the method', () => {
+      component.onClickSuggestion(testValue);
+      expect(component.value).toEqual(testValue);
+    });
+  });
+
+});
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
new file mode 100644
index 0000000000..c868281e00
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/org-unit/org-unit-suggestions/org-unit-input-suggestions.component.ts
@@ -0,0 +1,48 @@
+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({
+  selector: 'ds-org-unit-input-suggestions',
+  styleUrls: ['./org-unit-input-suggestions.component.scss', './../../../../../../shared/input-suggestions/input-suggestions.component.scss'],
+  templateUrl: './org-unit-input-suggestions.component.html',
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
+      // tslint:disable-next-line:no-forward-ref
+      useExisting: forwardRef(() => OrgUnitInputSuggestionsComponent),
+      multi: true
+    }
+  ]
+})
+
+/**
+ * Component representing a form with a autocomplete functionality
+ */
+export class OrgUnitInputSuggestionsComponent extends InputSuggestionsComponent implements OnInit {
+  /**
+   * The suggestions that should be shown
+   */
+  @Input() suggestions: string[] = [];
+
+  ngOnInit() {
+    if (this.suggestions.length > 0) {
+      this.value = this.suggestions[0]
+    }
+  }
+
+  onSubmit(data) {
+    this.value = data;
+    this.submitSuggestion.emit(data);
+  }
+
+  onClickSuggestion(data) {
+    this.value = data;
+    this.clickSuggestion.emit(data);
+    this.close();
+    this.blockReopen = true;
+    this.queryInput.nativeElement.focus();
+    return false;
+  }
+}
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
new file mode 100644
index 0000000000..df93c2f4f3
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.html
@@ -0,0 +1,16 @@
+<div class="d-flex">
+    <div class="person-thumbnail pr-2">
+        <ds-thumbnail [thumbnail]="dso.getThumbnail() | async" [defaultImage]="'assets/images/person-placeholder.svg'"></ds-thumbnail>
+    </div>
+    <div class="flex-grow-1">
+        <ds-person-input-suggestions [suggestions]="allSuggestions" [(ngModel)]="selectedName" (clickSuggestion)="select($event)" (submitSuggestion)="selectCustom($event)"></ds-person-input-suggestions>
+        <span class="text-muted">
+        <span *ngIf="dso.allMetadata(['person.jobTitle']).length > 0"
+              class="item-list-job-title">
+                <span *ngFor="let value of allMetadataValues(['person.jobTitle']); let last=last;">
+                    <span [innerHTML]="value"><span [innerHTML]="value"></span></span>
+                </span>
+        </span>
+    </span>
+    </div>
+</div>
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.scss
new file mode 100644
index 0000000000..8fc6d2138d
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.scss
@@ -0,0 +1,7 @@
+@import '../../../../../../styles/variables';
+
+$submission-relationship-thumbnail-width: 80px;
+
+.person-thumbnail {
+    width: $submission-relationship-thumbnail-width;
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..a21f0ec075
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.spec.ts
@@ -0,0 +1,124 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
+import { By } from '@angular/platform-browser';
+import { of as observableOf } from 'rxjs';
+import { ItemSearchResult } from '../../../../../shared/object-collection/shared/item-search-result.model';
+import { PersonSearchResultListSubmissionElementComponent } from './person-search-result-list-submission-element.component';
+import { Item } from '../../../../../core/shared/item.model';
+import { TruncatePipe } from '../../../../../shared/utils/truncate.pipe';
+import { TruncatableService } from '../../../../../shared/truncatable/truncatable.service';
+import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { NotificationsService } from '../../../../../shared/notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { NgbModal } from '@ng-bootstrap/ng-bootstrap';
+import { ItemDataService } from '../../../../../core/data/item-data.service';
+import { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
+import { Store } from '@ngrx/store';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../shared/testing/utils';
+import { PaginatedList } from '../../../../../core/data/paginated-list';
+
+let personListElementComponent: PersonSearchResultListSubmissionElementComponent;
+let fixture: ComponentFixture<PersonSearchResultListSubmissionElementComponent>;
+
+let mockItemWithMetadata: ItemSearchResult;
+let mockItemWithoutMetadata: ItemSearchResult;
+
+let nameVariant;
+let mockRelationshipService;
+
+function init() {
+  mockItemWithMetadata = Object.assign(
+    new ItemSearchResult(),
+    {
+      indexableObject: Object.assign(new Item(), {
+        bundles: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [])),
+        metadata: {
+          'dc.title': [
+            {
+              language: 'en_US',
+              value: 'This is just another title'
+            }
+          ],
+          'person.jobTitle': [
+            {
+              language: 'en_US',
+              value: 'Developer'
+            }
+          ]
+        }
+      })
+    });
+  mockItemWithoutMetadata = Object.assign(
+    new ItemSearchResult(),
+    {
+      indexableObject: Object.assign(new Item(), {
+        bundles: createSuccessfulRemoteDataObject$(new PaginatedList(undefined, [])),
+        metadata: {
+          'dc.title': [
+            {
+              language: 'en_US',
+              value: 'This is just another title'
+            }
+          ]
+        }
+      })
+    });
+
+  nameVariant = 'Doe J.';
+  mockRelationshipService = {
+    getNameVariant: () => observableOf(nameVariant)
+  };
+}
+
+describe('PersonSearchResultListElementSubmissionComponent', () => {
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [PersonSearchResultListSubmissionElementComponent, TruncatePipe],
+      providers: [
+        { provide: TruncatableService, useValue: {} },
+        { provide: RelationshipService, useValue: mockRelationshipService },
+        { provide: NotificationsService, useValue: {} },
+        { provide: TranslateService, useValue: {} },
+        { provide: NgbModal, useValue: {} },
+        { provide: ItemDataService, useValue: {} },
+        { provide: SelectableListService, useValue: {} },
+        { provide: Store, useValue: {}}
+      ],
+
+      schemas: [NO_ERRORS_SCHEMA]
+    }).overrideComponent(PersonSearchResultListSubmissionElementComponent, {
+      set: { changeDetection: ChangeDetectionStrategy.Default }
+    }).compileComponents();
+  }));
+
+  beforeEach(async(() => {
+    fixture = TestBed.createComponent(PersonSearchResultListSubmissionElementComponent);
+    personListElementComponent = fixture.componentInstance;
+
+  }));
+
+  describe('When the item has a job title', () => {
+    beforeEach(() => {
+      personListElementComponent.object = mockItemWithMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should show the job title span', () => {
+      const jobTitleField = fixture.debugElement.query(By.css('span.item-list-job-title'));
+      expect(jobTitleField).not.toBeNull();
+    });
+  });
+
+  describe('When the item has no job title', () => {
+    beforeEach(() => {
+      personListElementComponent.object = mockItemWithoutMetadata;
+      fixture.detectChanges();
+    });
+
+    it('should not show the job title span', () => {
+      const jobTitleField = fixture.debugElement.query(By.css('span.item-list-job-title'));
+      expect(jobTitleField).toBeNull();
+    });
+  });
+});
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
new file mode 100644
index 0000000000..37fd77649b
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-search-result-list-submission-element.component.ts
@@ -0,0 +1,98 @@
+import { Component, OnInit } from '@angular/core';
+import { SearchResultListElementComponent } from '../../../../../shared/object-list/search-result-list-element/search-result-list-element.component';
+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 { RelationshipService } from '../../../../../core/data/relationship.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 { SelectableListService } from '../../../../../shared/object-list/selectable-list/selectable-list.service';
+
+@listableObjectComponent('PersonSearchResult', ViewMode.ListElement, Context.SubmissionModal)
+@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'
+})
+
+/**
+ * The component for displaying a list element for an item search result of the type Person
+ */
+export class PersonSearchResultListSubmissionElementComponent extends SearchResultListElementComponent<ItemSearchResult, Item> implements OnInit {
+  allSuggestions: string[];
+  selectedName: string;
+  alternativeField = 'dc.title.alternative';
+
+  constructor(protected truncatableService: TruncatableService,
+              private relationshipService: RelationshipService,
+              private notificationsService: NotificationsService,
+              private translateService: TranslateService,
+              private modalService: NgbModal,
+              private itemDataService: ItemDataService,
+              private selectableListService: SelectableListService) {
+    super(truncatableService);
+  }
+
+  ngOnInit() {
+    super.ngOnInit();
+    const defaultValue = this.firstMetadataValue('person.familyName') + ', ' + this.firstMetadataValue('person.givenName');
+    const alternatives = this.allMetadataValues(this.alternativeField);
+    this.allSuggestions = [defaultValue, ...alternatives];
+
+    this.relationshipService.getNameVariant(this.listID, this.dso.uuid)
+      .pipe(take(1))
+      .subscribe((nameVariant: string) => {
+          this.selectedName = nameVariant || defaultValue;
+        }
+      );
+  }
+
+  select(value) {
+    this.selectableListService.isObjectSelected(this.listID, this.object)
+      .pipe(take(1))
+      .subscribe((selected) => {
+        if (!selected) {
+          this.selectableListService.selectSingle(this.listID, this.object);
+        }
+      });
+    this.relationshipService.setNameVariant(this.listID, this.dso.uuid, value);
+  }
+
+  selectCustom(value) {
+    if (!this.allSuggestions.includes(value)) {
+      this.openModal(value)
+        .then(() => {
+
+          const newName: MetadataValue = new MetadataValue();
+          newName.value = value;
+
+          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
+              },
+            });
+          this.itemDataService.update(updatedItem).pipe(take(1)).subscribe();
+        })
+    }
+    this.select(value);
+  }
+
+  openModal(value): Promise<any> {
+    const modalRef = this.modalService.open(NameVariantModalComponent, { centered: true });
+    const modalComp = modalRef.componentInstance;
+    modalComp.value = value;
+    return modalRef.result;
+  }
+}
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
new file mode 100644
index 0000000000..e177b2b561
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.html
@@ -0,0 +1,24 @@
+<form #form="ngForm" (ngSubmit)="onSubmit(value)"
+      [action]="action" (keydown)="onKeydown($event)"
+      (keydown.arrowdown)="shiftFocusDown($event)"
+      (keydown.arrowup)="shiftFocusUp($event)" (keydown.esc)="close()"
+      (dsClickOutside)="close();">
+    <input #inputField type="text" [(ngModel)]="value" [name]="name"
+           class="form-control suggestion_input"
+           (focus)="open()"
+           (click)="open()"
+           [ngClass]="{'is-invalid': !valid}"
+           [dsDebounce]="debounceTime" (onDebounce)="find($event)"
+           [placeholder]="placeholder"
+           [ngModelOptions]="{standalone: true}" autocomplete="off"/>
+    <input type="submit" class="d-none"/>
+    <div class="autocomplete dropdown-menu" [ngClass]="{'show': (show | async) && isNotEmpty(suggestions)}">
+        <div class="dropdown-list">
+            <div *ngFor="let suggestionOption of suggestions">
+                <a href="#" class="d-block dropdown-item"  (click)="onClickSuggestion(suggestionOption)" #suggestion>
+                    <span [innerHTML]="suggestionOption"></span>
+                </a>
+            </div>
+        </div>
+    </div>
+</form>
\ No newline at end of file
diff --git a/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
new file mode 100644
index 0000000000..8301e12c5f
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.scss
@@ -0,0 +1,18 @@
+form {
+    z-index: 1;
+    &:before {
+        position: absolute;
+        font-weight: 900;
+        font-family: "Font Awesome 5 Free";
+        content: "\f0d7";
+        top: 7px;
+        right: 0;
+        height: 20px;
+        width: 20px;
+        z-index: -1;
+    }
+
+    input.suggestion_input {
+        background: transparent;
+    }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..a1802ce1a7
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/item-list-elements/person/person-suggestions/person-input-suggestions.component.ts
@@ -0,0 +1,48 @@
+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({
+  selector: 'ds-person-input-suggestions',
+  styleUrls: ['./person-input-suggestions.component.scss', './../../../../../../shared/input-suggestions/input-suggestions.component.scss'],
+  templateUrl: './person-input-suggestions.component.html',
+  providers: [
+    {
+      provide: NG_VALUE_ACCESSOR,
+      // Usage of forwardRef necessary https://github.com/angular/angular.io/issues/1151
+      // tslint:disable-next-line:no-forward-ref
+      useExisting: forwardRef(() => PersonInputSuggestionsComponent),
+      multi: true
+    }
+  ]
+})
+
+/**
+ * Component representing a form with a autocomplete functionality
+ */
+export class PersonInputSuggestionsComponent extends InputSuggestionsComponent implements OnInit {
+  /**
+   * The suggestions that should be shown
+   */
+  @Input() suggestions: string[] = [];
+
+  ngOnInit() {
+    if (this.suggestions.length > 0) {
+      this.value = this.suggestions[0]
+    }
+  }
+
+  onSubmit(data) {
+    this.value = data;
+    this.submitSuggestion.emit(data);
+  }
+
+  onClickSuggestion(data) {
+    this.value = data;
+    this.clickSuggestion.emit(data);
+    this.close();
+    this.blockReopen = true;
+    this.queryInput.nativeElement.focus();
+    return false;
+  }
+}
diff --git a/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html
new file mode 100644
index 0000000000..13ae884ccb
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.html
@@ -0,0 +1,13 @@
+<div class="modal-header">
+    <h4 class="modal-title">New name variant</h4>
+    <button type="button" class="close" aria-label="Close" (click)="modal.dismiss('Cross click')">
+        <span aria-hidden="true">&times;</span>
+    </button>
+</div>
+<div class="modal-body">
+    {{'submission.sections.describe.relationship-lookup.name-variant.notification.content' | translate: { value: value } }}
+</div>
+<div class="modal-footer justify-content-between">
+    <button type="button" class="btn btn-light confirm-button" (click)="modal.close()">{{'submission.sections.describe.relationship-lookup.name-variant.notification.confirm' | translate }}</button>
+    <button type="button" class="btn btn-light decline-button" (click)="modal.dismiss()">{{'submission.sections.describe.relationship-lookup.name-variant.notification.decline' | translate }}</button>
+</div>
diff --git a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.scss b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.scss
similarity index 100%
rename from src/app/+search-page/search-switch-configuration/search-switch-configuration.component.scss
rename to src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.scss
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
new file mode 100644
index 0000000000..b5043ea2d6
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.spec.ts
@@ -0,0 +1,53 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+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;
+  let fixture: ComponentFixture<NameVariantModalComponent>;
+  let debugElement;
+  let modal;
+
+  function init() {
+    modal = jasmine.createSpyObj('modal', ['close', 'dismiss']);
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [NameVariantModalComponent],
+      imports: [NgbModule.forRoot(), TranslateModule.forRoot()],
+      providers: [{ provide: NgbActiveModal, useValue: modal }]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(NameVariantModalComponent);
+    component = fixture.componentInstance;
+    debugElement = fixture.debugElement;
+    fixture.detectChanges();
+
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('when close button is clicked, dismiss should be called on the modal', () => {
+    debugElement.query(By.css('button.close')).triggerEventHandler('click', {});
+    expect(modal.dismiss).toHaveBeenCalled();
+  });
+
+  it('when confirm button is clicked, close should be called on the modal', () => {
+    debugElement.query(By.css('button.confirm-button')).triggerEventHandler('click', {});
+    expect(modal.close).toHaveBeenCalled();
+  });
+
+  it('when decline button is clicked, dismiss should be called on the modal', () => {
+    debugElement.query(By.css('button.decline-button')).triggerEventHandler('click', {});
+    expect(modal.dismiss).toHaveBeenCalled();
+  });
+});
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
new file mode 100644
index 0000000000..eb6f7d01ac
--- /dev/null
+++ b/src/app/entity-groups/research-entities/submission/name-variant-modal/name-variant-modal.component.ts
@@ -0,0 +1,24 @@
+import { Component, Input } from '@angular/core';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+
+/**
+ * This component a pop up for when the user selects a custom name variant during submission for a relationship$
+ * The user can either choose to decline or accept to save the name variant as a metadata in the entity
+ */
+@Component({
+  selector: 'ds-name-variant-modal',
+  templateUrl: './name-variant-modal.component.html',
+  styleUrls: ['./name-variant-modal.component.scss']
+})
+/**
+ * The component for the modal to add a name variant to an item
+ */
+export class NameVariantModalComponent {
+  /**
+   * The name variant
+   */
+  @Input() value: string;
+
+  constructor(public modal: NgbActiveModal) {
+  }
+}
diff --git a/src/app/header/header.component.html b/src/app/header/header.component.html
index a03fd01c53..58f7cb1ecf 100644
--- a/src/app/header/header.component.html
+++ b/src/app/header/header.component.html
@@ -1,20 +1,20 @@
 <header>
-    <div class="container">
-        <a class="navbar-brand my-2" routerLink="/home">
-            <img src="assets/images/dspace-logo.svg"/>
-        </a>
+  <div class="container">
+    <a class="navbar-brand my-2" routerLink="/home">
+      <img src="assets/images/dspace-logo.svg"/>
+    </a>
 
-        <nav class="navbar navbar-light navbar-expand-md float-right px-0">
-            <a routerLink="/search" class="px-1"><i class="fas fa-search fa-lg fa-fw" [title]="'nav.search' | translate"></i></a>
-            <ds-lang-switch></ds-lang-switch>
-            <ds-auth-nav-menu></ds-auth-nav-menu>
-            <div class="pl-2">
-                <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
-                        aria-controls="collapsingNav"
-                        aria-expanded="false" aria-label="Toggle navigation">
-                    <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
-                </button>
-            </div>
-        </nav>
-    </div>
+    <nav class="navbar navbar-light navbar-expand-md float-right px-0">
+      <ds-search-navbar></ds-search-navbar>
+      <ds-lang-switch></ds-lang-switch>
+      <ds-auth-nav-menu></ds-auth-nav-menu>
+      <div class="pl-2">
+        <button class="navbar-toggler" type="button" (click)="toggleNavbar()"
+                aria-controls="collapsingNav"
+                aria-expanded="false" aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon fas fa-bars fa-fw" aria-hidden="true"></span>
+        </button>
+      </div>
+    </nav>
+  </div>
 </header>
diff --git a/src/app/navbar/navbar.component.ts b/src/app/navbar/navbar.component.ts
index 4c7c3cd030..b2ba10fb98 100644
--- a/src/app/navbar/navbar.component.ts
+++ b/src/app/navbar/navbar.component.ts
@@ -53,17 +53,18 @@ export class NavbarComponent extends MenuComponent implements OnInit {
         } as TextMenuItemModel,
         index: 0
       },
-      // {
-      //   id: 'browse_global_communities_and_collections',
-      //   parentID: 'browse_global',
-      //   active: false,
-      //   visible: true,
-      //   model: {
-      //     type: MenuItemType.LINK,
-      //     text: 'menu.section.browse_global_communities_and_collections',
-      //     link: '#'
-      //   } as LinkMenuItemModel,
-      // },
+      /* Communities & Collections tree */
+      {
+        id: `browse_global_communities_and_collections`,
+        parentID: 'browse_global',
+        active: false,
+        visible: true,
+        model: {
+          type: MenuItemType.LINK,
+          text: `menu.section.browse_global_communities_and_collections`,
+          link: `/community-list`
+        } as LinkMenuItemModel
+      },
 
       /* Statistics */
       {
diff --git a/src/app/search-navbar/search-navbar.component.html b/src/app/search-navbar/search-navbar.component.html
new file mode 100644
index 0000000000..13d792c80f
--- /dev/null
+++ b/src/app/search-navbar/search-navbar.component.html
@@ -0,0 +1,12 @@
+<div id="search-navbar-container" [title]="'nav.search' | translate" (dsClickOutside)="collapse()">
+  <div class="d-inline-block position-relative">
+    <form [formGroup]="searchForm" (ngSubmit)="onSubmit(searchForm.value)" autocomplete="on">
+      <input #searchInput [@toggleAnimation]="isExpanded" id="query" 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">
+      <a class="sticky-top submit-icon" (click)="searchExpanded ? onSubmit(searchForm.value) : expand()">
+        <em class="fas fa-search fa-lg fa-fw"></em>
+      </a>
+    </form>
+  </div>
+</div>
diff --git a/src/app/search-navbar/search-navbar.component.scss b/src/app/search-navbar/search-navbar.component.scss
new file mode 100644
index 0000000000..3606c47afc
--- /dev/null
+++ b/src/app/search-navbar/search-navbar.component.scss
@@ -0,0 +1,25 @@
+input[type="text"] {
+  margin-top: -0.5 * $font-size-base;
+
+  &:focus {
+    background-color: rgba(255, 255, 255, 0.5) !important;
+  }
+
+  &.collapsed {
+    opacity: 0;
+  }
+}
+
+a.submit-icon {
+  cursor: pointer;
+}
+
+
+
+@media screen and (max-width: map-get($grid-breakpoints, sm)) {
+  #query:focus {
+    max-width: 250px !important;
+    width: 40vw !important;
+  }
+}
+
diff --git a/src/app/search-navbar/search-navbar.component.spec.ts b/src/app/search-navbar/search-navbar.component.spec.ts
new file mode 100644
index 0000000000..2a03acd2a2
--- /dev/null
+++ b/src/app/search-navbar/search-navbar.component.spec.ts
@@ -0,0 +1,121 @@
+import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core/testing';
+import { FormsModule, ReactiveFormsModule } from '@angular/forms';
+import { By } from '@angular/platform-browser';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { Router } from '@angular/router';
+import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
+import { SearchService } from '../core/shared/search/search.service';
+import { MockTranslateLoader } from '../shared/mocks/mock-translate-loader';
+
+import { SearchNavbarComponent } from './search-navbar.component';
+
+describe('SearchNavbarComponent', () => {
+  let component: SearchNavbarComponent;
+  let fixture: ComponentFixture<SearchNavbarComponent>;
+  let mockSearchService: any;
+  let router: Router;
+  let routerStub;
+
+  beforeEach(async(() => {
+    mockSearchService = {
+      getSearchLink() {
+        return '/search';
+      }
+    };
+
+    routerStub = {
+      navigate: (commands) => commands
+    };
+    TestBed.configureTestingModule({
+      imports: [
+        FormsModule,
+        ReactiveFormsModule,
+        BrowserAnimationsModule,
+        TranslateModule.forRoot({
+          loader: {
+            provide: TranslateLoader,
+            useClass: MockTranslateLoader
+          }
+        })],
+      declarations: [SearchNavbarComponent],
+      providers: [
+        { provide: SearchService, useValue: mockSearchService },
+        { provide: Router, useValue: routerStub }
+      ]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SearchNavbarComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+    router = (component as any).router;
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('when you click on search icon', () => {
+    beforeEach(fakeAsync(() => {
+      spyOn(component, 'expand').and.callThrough();
+      spyOn(component, 'onSubmit').and.callThrough();
+      spyOn(router, 'navigate').and.callThrough();
+      const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+      searchIcon.triggerEventHandler('click', {
+        preventDefault: () => {/**/
+        }
+      });
+      tick();
+      fixture.detectChanges();
+    }));
+
+    it('input expands', () => {
+      expect(component.expand).toHaveBeenCalled();
+    });
+
+    describe('empty query', () => {
+      describe('press submit button', () => {
+        beforeEach(fakeAsync(() => {
+          const searchIcon = fixture.debugElement.query(By.css('#search-navbar-container form .submit-icon'));
+          searchIcon.triggerEventHandler('click', {
+            preventDefault: () => {/**/
+            }
+          });
+          tick();
+          fixture.detectChanges();
+        }));
+        it('to search page with empty query', () => {
+          expect(component.onSubmit).toHaveBeenCalledWith({ query: '' });
+          expect(router.navigate).toHaveBeenCalled();
+        });
+      });
+    });
+
+    describe('fill in some query', () => {
+      let searchInput;
+      beforeEach(async () => {
+        await fixture.whenStable();
+        fixture.detectChanges();
+        searchInput = fixture.debugElement.query(By.css('#search-navbar-container 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'));
+          searchIcon.triggerEventHandler('click', null);
+          tick();
+          fixture.detectChanges();
+        }));
+        it('to search page with query', async () => {
+          expect(component.onSubmit).toHaveBeenCalledWith({ query: 'test' });
+          expect(router.navigate).toHaveBeenCalled();
+        });
+      });
+    })
+
+  });
+});
diff --git a/src/app/search-navbar/search-navbar.component.ts b/src/app/search-navbar/search-navbar.component.ts
new file mode 100644
index 0000000000..1bedfb73ef
--- /dev/null
+++ b/src/app/search-navbar/search-navbar.component.ts
@@ -0,0 +1,71 @@
+import { Component, ElementRef, ViewChild } from '@angular/core';
+import { FormBuilder } from '@angular/forms';
+import { Router } from '@angular/router';
+import { SearchService } from '../core/shared/search/search.service';
+import { expandSearchInput } from '../shared/animations/slide';
+
+/**
+ * The search box in the header that expands on focus and collapses on focus out
+ */
+@Component({
+  selector: 'ds-search-navbar',
+  templateUrl: './search-navbar.component.html',
+  styleUrls: ['./search-navbar.component.scss'],
+  animations: [expandSearchInput]
+})
+export class SearchNavbarComponent {
+
+  // The search form
+  searchForm;
+  // Whether or not the search bar is expanded, boolean for html ngIf, string fo AngularAnimation state change
+  searchExpanded = false;
+  isExpanded = 'collapsed';
+
+  // Search input field
+  @ViewChild('searchInput') searchField: ElementRef;
+
+  constructor(private formBuilder: FormBuilder, private router: Router, private searchService: SearchService) {
+    this.searchForm = this.formBuilder.group(({
+      query: '',
+    }));
+  }
+
+  /**
+   * Expands search bar by angular animation, see expandSearchInput
+   */
+  expand() {
+    this.searchExpanded = true;
+    this.isExpanded = 'expanded';
+    this.editSearch();
+  }
+
+  /**
+   * Collapses & blurs search bar by angular animation, see expandSearchInput
+   */
+  collapse() {
+    this.searchField.nativeElement.blur();
+    this.searchExpanded = false;
+    this.isExpanded = 'collapsed';
+  }
+
+  /**
+   * Focuses on input search bar so search can be edited
+   */
+  editSearch(): void {
+    this.searchField.nativeElement.focus();
+  }
+
+  /**
+   * Submits the search (on enter or on search icon click)
+   * @param data  Data for the searchForm, containing the search query
+   */
+  onSubmit(data: any) {
+    this.collapse();
+    const linkToNavigateTo = this.searchService.getSearchLink().split('/');
+    this.searchForm.reset();
+    this.router.navigate(linkToNavigateTo, {
+      queryParams: Object.assign({}, { page: 1 }, data),
+      queryParamsHandling: 'merge'
+    });
+  }
+}
diff --git a/src/app/shared/animations/slide.ts b/src/app/shared/animations/slide.ts
index 38bfaaddca..7928a25659 100644
--- a/src/app/shared/animations/slide.ts
+++ b/src/app/shared/animations/slide.ts
@@ -1,13 +1,4 @@
-import {
-  animate,
-  animateChild,
-  group,
-  query,
-  state,
-  style,
-  transition,
-  trigger
-} from '@angular/animations';
+import { animate, animateChild, group, query, state, style, transition, trigger } from '@angular/animations';
 
 export const slide = trigger('slide', [
   state('expanded', style({ height: '*' })),
@@ -70,3 +61,30 @@ export const slideSidebarPadding = trigger('slideSidebarPadding', [
   transition('hidden <=> expanded', [animate('200ms')]),
   transition('shown <=> expanded', [animate('200ms')]),
 ]);
+
+export const expandSearchInput = trigger('toggleAnimation', [
+  state('collapsed', style({
+    width: '30px',
+    opacity: '0'
+  })),
+  state('expanded', style({
+    width: '250px',
+    opacity: '1'
+  })),
+  transition('* => collapsed', group([
+    animate('300ms ease-in-out', style({
+      width: '30px'
+    })),
+    animate('300ms ease-in', style({
+      opacity: '0'
+    }))
+  ])),
+  transition('* => expanded', group([
+    animate('300ms ease-out', style({
+      opacity: '1'
+    })),
+    animate('300ms ease-in-out', style({
+      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 4df07880d8..86de30c23e 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,6 +1,6 @@
 <ul class="navbar-nav" [ngClass]="{'mr-auto': (isXsOrSm$ | async)}">
   <li *ngIf="!(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item" (click)="$event.stopPropagation();">
-    <div ngbDropdown placement="bottom-right" class="d-inline-block" @fadeInOut>
+    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
       <a href="#" id="dropdownLogin" (click)="$event.preventDefault()" ngbDropdownToggle class="px-1">{{ 'nav.login' | translate }}</a>
       <div id="loginDropdownMenu" [ngClass]="{'pl-3 pr-3': (loading | async)}" ngbDropdownMenu aria-labelledby="dropdownLogin">
         <ds-log-in
@@ -12,7 +12,7 @@
     <a id="loginLink" routerLink="/login" routerLinkActive="active" class="px-1" >{{ 'nav.login' | translate }}<span class="sr-only">(current)</span></a>
   </li>
   <li *ngIf="(isAuthenticated | async) && !(isXsOrSm$ | async) && (showAuth | async)" class="nav-item">
-    <div ngbDropdown placement="bottom-right" class="d-inline-block" @fadeInOut>
+    <div ngbDropdown display="dynamic" placement="bottom-right" class="d-inline-block" @fadeInOut>
       <a href="#" id="dropdownUser" (click)="$event.preventDefault()" class="px-1" ngbDropdownToggle><i class="fas fa-user-circle fa-lg fa-fw" [title]="'nav.logout' | translate"></i></a>
       <div id="logoutDropdownMenu" ngbDropdownMenu aria-labelledby="dropdownUser">
         <ds-user-menu></ds-user-menu>
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
index 6c67937063..09f7e459e4 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.html
@@ -1,3 +1,38 @@
+<div class="container-fluid">
+  <div class="row">
+    <div class="col-12 d-inline-block">
+      <label>{{type.value + '.edit.logo.label' | translate}}</label>
+    </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">
+        <div class="row">
+          <div class="col-8 d-inline-block">
+            <ds-comcol-page-logo [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">
+              <button *ngIf="!markLogoForDeletion" type="button" class="btn btn-danger" (click)="deleteLogo()">
+                <i class="fas fa-trash" aria-hidden="true"></i>
+              </button>
+              <button *ngIf="markLogoForDeletion" type="button" class="btn btn-warning" (click)="undoDeleteLogo()">
+                <i class="fas fa-undo" aria-hidden="true"></i>
+              </button>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div *ngIf="!logo" class="col-12 d-inline-block">
+        <ds-uploader  *ngIf="initializedUploaderOptions | async"
+                      [dropMsg]="type.value + '.edit.logo.upload'"
+                      [dropOverDocumentMsg]="type.value + '.edit.logo.upload'"
+                      [enableDragOverDocument]="true"
+                      [uploadFilesOptions]="uploadFilesOptions"
+                      (onCompleteItem)="onCompleteItem()"
+                      (onUploadError)="onUploadError()"></ds-uploader>
+      </div>
+    </ng-container>
+  </div>
+</div>
 <ds-form *ngIf="formModel"
          [formId]="'comcol-form-id'"
          [formModel]="formModel" (submitForm)="onSubmit()" (cancel)="onCancel()"></ds-form>
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
index 1b44970402..58488f721a 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.spec.ts
@@ -3,14 +3,25 @@ import { TranslateModule } from '@ngx-translate/core';
 import { Location } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
+import { DynamicFormControlModel, DynamicFormService, DynamicInputModel } from '@ng-dynamic-forms/core';
 import { FormControl, FormGroup } from '@angular/forms';
-import { DynamicFormControlModel } from '@ng-dynamic-forms/core/src/model/dynamic-form-control.model';
 import { Community } from '../../../core/shared/community.model';
-import { ResourceType } from '../../../core/shared/resource-type';
 import { ComColFormComponent } from './comcol-form.component';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { hasValue } from '../../empty.util';
+import { VarDirective } from '../../utils/var.directive';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { NotificationsServiceStub } from '../../testing/notifications-service-stub';
+import { AuthService } from '../../../core/auth/auth.service';
+import { AuthServiceMock } from '../../mocks/mock-auth.service';
+import { of as observableOf } from 'rxjs';
+import { RemoteData } from '../../../core/data/remote-data';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import { ErrorResponse, RestResponse } from '../../../core/cache/response.models';
+import { RequestError } from '../../../core/data/request.models';
+import { RequestService } from '../../../core/data/request.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
+import { By } from '@angular/platform-browser';
 
 describe('ComColFormComponent', () => {
   let comp: ComColFormComponent<DSpaceObject>;
@@ -49,71 +60,264 @@ describe('ComColFormComponent', () => {
     })
   ];
 
+  const logoEndpoint = 'rest/api/logo/endpoint';
+  const dsoService = Object.assign({
+    getLogoEndpoint: () => observableOf(logoEndpoint),
+    deleteLogo: () => observableOf({})
+  });
+  const notificationsService = new NotificationsServiceStub();
+
   /* tslint:disable:no-empty */
   const locationStub = jasmine.createSpyObj('location', ['back']);
   /* tslint:enable:no-empty */
 
+  const requestServiceStub = jasmine.createSpyObj({
+    removeByHrefSubstring: {}
+  });
+  const objectCacheStub = jasmine.createSpyObj({
+    remove: {}
+  });
+
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule],
-      declarations: [ComColFormComponent],
+      declarations: [ComColFormComponent, VarDirective],
       providers: [
         { provide: Location, useValue: locationStub },
-        { provide: DynamicFormService, useValue: formServiceStub }
+        { provide: DynamicFormService, useValue: formServiceStub },
+        { provide: NotificationsService, useValue: notificationsService },
+        { provide: AuthService, useValue: new AuthServiceMock() },
+        { provide: RequestService, useValue: requestServiceStub },
+        { provide: ObjectCacheService, useValue: objectCacheStub }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
   }));
 
-  beforeEach(() => {
-    fixture = TestBed.createComponent(ComColFormComponent);
-    comp = fixture.componentInstance;
-    comp.formModel = [];
-    comp.dso = new Community();
-    fixture.detectChanges();
-    location = (comp as any).location;
-  });
-
-  describe('onSubmit', () => {
+  describe('when the dso doesn\'t contain an ID (newly created)', () => {
     beforeEach(() => {
-      spyOn(comp.submitForm, 'emit');
-      comp.formModel = formModel;
+      initComponent(new Community());
     });
 
-    it('should emit the new version of the community', () => {
-      comp.dso = Object.assign(
-        new Community(),
-        {
-          metadata: {
-            ...titleMD,
-            ...randomMD
-          }
-        }
-      );
+    it('should initialize the uploadFilesOptions with a placeholder url', () => {
+      expect(comp.uploadFilesOptions.url.length).toBeGreaterThan(0);
+    });
 
-      comp.onSubmit();
+    describe('onSubmit', () => {
+      beforeEach(() => {
+        spyOn(comp.submitForm, 'emit');
+        comp.formModel = formModel;
+      });
 
-      expect(comp.submitForm.emit).toHaveBeenCalledWith(
-        Object.assign(
-          {},
+      it('should emit the new version of the community', () => {
+        comp.dso = Object.assign(
           new Community(),
           {
             metadata: {
-              ...newTitleMD,
-              ...randomMD,
-              ...abstractMD
-            },
-            type: Community.type
-          },
-        )
-      );
-    })
-  });
+              ...titleMD,
+              ...randomMD
+            }
+          }
+        );
 
-  describe('onCancel', () => {
-    it('should call the back method on the Location service', () => {
+        comp.onSubmit();
+
+        expect(comp.submitForm.emit).toHaveBeenCalledWith(
+          {
+            dso: Object.assign(
+              {},
+              new Community(),
+              {
+                metadata: {
+                  ...newTitleMD,
+                  ...randomMD,
+                  ...abstractMD
+                },
+                type: Community.type
+              },
+            ),
+            uploader: {} as any,
+            deleteLogo: false
+          }
+        );
+      })
+    });
+
+    describe('onCancel', () => {
+      it('should call the back method on the Location service', () => {
         comp.onCancel();
         expect(locationStub.back).toHaveBeenCalled();
+      });
+    });
+
+    describe('onCompleteItem', () => {
+      beforeEach(() => {
+        spyOn(comp.finish, 'emit');
+        comp.onCompleteItem();
+      });
+
+      it('should show a success notification', () => {
+        expect(notificationsService.success).toHaveBeenCalled();
+      });
+
+      it('should emit finish', () => {
+        expect(comp.finish.emit).toHaveBeenCalled();
+      });
+
+      it('should remove the object\'s cache', () => {
+        expect(requestServiceStub.removeByHrefSubstring).toHaveBeenCalled();
+        expect(objectCacheStub.remove).toHaveBeenCalled();
+      });
+    });
+
+    describe('onUploadError', () => {
+      beforeEach(() => {
+        spyOn(comp.finish, 'emit');
+        comp.onUploadError();
+      });
+
+      it('should show an error notification', () => {
+        expect(notificationsService.error).toHaveBeenCalled();
+      });
+
+      it('should emit finish', () => {
+        expect(comp.finish.emit).toHaveBeenCalled();
+      });
     });
   });
+
+  describe('when the dso contains an ID (being edited)', () => {
+    describe('and the dso doesn\'t contain a logo', () => {
+      beforeEach(() => {
+        initComponent(Object.assign(new Community(), {
+          id: 'community-id',
+          logo: observableOf(new RemoteData(false, false, true, null, undefined))
+        }));
+      });
+
+      it('should initialize the uploadFilesOptions with the logo\'s endpoint url', () => {
+        expect(comp.uploadFilesOptions.url).toEqual(logoEndpoint);
+      });
+
+      it('should initialize the uploadFilesOptions with a POST method', () => {
+        expect(comp.uploadFilesOptions.method).toEqual(RestRequestMethod.POST);
+      });
+    });
+
+    describe('and the dso contains a logo', () => {
+      beforeEach(() => {
+        initComponent(Object.assign(new Community(), {
+          id: 'community-id',
+          logo: observableOf(new RemoteData(false, false, true, null, {}))
+        }));
+      });
+
+      it('should initialize the uploadFilesOptions with the logo\'s endpoint url', () => {
+        expect(comp.uploadFilesOptions.url).toEqual(logoEndpoint);
+      });
+
+      it('should initialize the uploadFilesOptions with a PUT method', () => {
+        expect(comp.uploadFilesOptions.method).toEqual(RestRequestMethod.PUT);
+      });
+
+      describe('submit with logo marked for deletion', () => {
+        beforeEach(() => {
+          comp.markLogoForDeletion = true;
+        });
+
+        describe('when dsoService.deleteLogo returns a successful response', () => {
+          const response = new RestResponse(true, 200, 'OK');
+
+          beforeEach(() => {
+            spyOn(dsoService, 'deleteLogo').and.returnValue(observableOf(response));
+            comp.onSubmit();
+          });
+
+          it('should display a success notification', () => {
+            expect(notificationsService.success).toHaveBeenCalled();
+          });
+        });
+
+        describe('when dsoService.deleteLogo returns an error response', () => {
+          const response = new ErrorResponse(new RequestError('errorMessage'));
+
+          beforeEach(() => {
+            spyOn(dsoService, 'deleteLogo').and.returnValue(observableOf(response));
+            comp.onSubmit();
+          });
+
+          it('should display an error notification', () => {
+            expect(notificationsService.error).toHaveBeenCalled();
+          });
+        });
+      });
+
+      describe('deleteLogo', () => {
+        beforeEach(() => {
+          comp.deleteLogo();
+          fixture.detectChanges();
+        });
+
+        it('should set markLogoForDeletion to true', () => {
+          expect(comp.markLogoForDeletion).toEqual(true);
+        });
+
+        it('should mark the logo section with a danger alert', () => {
+          const logoSection = fixture.debugElement.query(By.css('#logo-section.alert-danger'));
+          expect(logoSection).toBeTruthy();
+        });
+
+        it('should hide the delete button', () => {
+          const button = fixture.debugElement.query(By.css('#logo-section .btn-danger'));
+          expect(button).not.toBeTruthy();
+        });
+
+        it('should show the undo button', () => {
+          const button = fixture.debugElement.query(By.css('#logo-section .btn-warning'));
+          expect(button).toBeTruthy();
+        });
+      });
+
+      describe('undoDeleteLogo', () => {
+        beforeEach(() => {
+          comp.markLogoForDeletion = true;
+          comp.undoDeleteLogo();
+          fixture.detectChanges();
+        });
+
+        it('should set markLogoForDeletion to false', () => {
+          expect(comp.markLogoForDeletion).toEqual(false);
+        });
+
+        it('should disable the danger alert on the logo section', () => {
+          const logoSection = fixture.debugElement.query(By.css('#logo-section.alert-danger'));
+          expect(logoSection).not.toBeTruthy();
+        });
+
+        it('should show the delete button', () => {
+          const button = fixture.debugElement.query(By.css('#logo-section .btn-danger'));
+          expect(button).toBeTruthy();
+        });
+
+        it('should hide the undo button', () => {
+          const button = fixture.debugElement.query(By.css('#logo-section .btn-warning'));
+          expect(button).not.toBeTruthy();
+        });
+      });
+    });
+  });
+
+  function initComponent(dso: Community) {
+    fixture = TestBed.createComponent(ComColFormComponent);
+    comp = fixture.componentInstance;
+    comp.formModel = [];
+    comp.dso = dso;
+    (comp as any).type = Community.type;
+    comp.uploaderComponent = Object.assign({
+      uploader: {}
+    });
+    (comp as any).dsoService = dsoService;
+    fixture.detectChanges();
+    location = (comp as any).location;
+  }
 });
diff --git a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
index 8d1d5c1dca..435ef61d72 100644
--- a/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
+++ b/src/app/shared/comcol-forms/comcol-form/comcol-form.component.ts
@@ -1,17 +1,34 @@
-import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { Component, EventEmitter, Input, OnDestroy, OnInit, Output, ViewChild } from '@angular/core';
 import { Location } from '@angular/common';
 import {
+  DynamicFormControlModel,
   DynamicFormService,
   DynamicInputModel
 } from '@ng-dynamic-forms/core';
 import { FormGroup } from '@angular/forms';
-import { DynamicFormControlModel } from '@ng-dynamic-forms/core/src/model/dynamic-form-control.model';
 import { TranslateService } from '@ngx-translate/core';
+
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { MetadataMap, MetadataValue } from '../../../core/shared/metadata.models';
 import { ResourceType } from '../../../core/shared/resource-type';
-import { isNotEmpty } from '../../empty.util';
+import { hasValue, isNotEmpty } from '../../empty.util';
+import { UploaderOptions } from '../../uploader/uploader-options.model';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { ComColDataService } from '../../../core/data/comcol-data.service';
+import { Subscription } from 'rxjs/internal/Subscription';
+import { AuthService } from '../../../core/auth/auth.service';
 import { Community } from '../../../core/shared/community.model';
+import { Collection } from '../../../core/shared/collection.model';
+import { UploaderComponent } from '../../uploader/uploader.component';
+import { FileUploader } from 'ng2-file-upload';
+import { ErrorResponse, RestResponse } from '../../../core/cache/response.models';
+import { BehaviorSubject } from 'rxjs/internal/BehaviorSubject';
+import { RemoteData } from '../../../core/data/remote-data';
+import { Bitstream } from '../../../core/shared/bitstream.model';
+import { combineLatest as observableCombineLatest } from 'rxjs';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import { RequestService } from '../../../core/data/request.service';
+import { ObjectCacheService } from '../../../core/cache/object-cache.service';
 
 /**
  * A form for creating and editing Communities or Collections
@@ -21,7 +38,13 @@ import { Community } from '../../../core/shared/community.model';
   styleUrls: ['./comcol-form.component.scss'],
   templateUrl: './comcol-form.component.html'
 })
-export class ComColFormComponent<T extends DSpaceObject> implements OnInit {
+export class ComColFormComponent<T extends DSpaceObject> implements OnInit, OnDestroy {
+
+  /**
+   * The logo uploader component
+   */
+  @ViewChild(UploaderComponent) uploaderComponent: UploaderComponent;
+
   /**
    * DSpaceObject that the form represents
    */
@@ -30,7 +53,7 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit {
   /**
    * Type of DSpaceObject that the form represents
    */
-  protected type: ResourceType;
+  type: ResourceType;
 
   /**
    * @type {string} Key prefix used to generate form labels
@@ -53,14 +76,56 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit {
   formGroup: FormGroup;
 
   /**
-   * Emits DSO when the form is submitted
-   * @type {EventEmitter<any>}
+   * The uploader configuration options
+   * @type {UploaderOptions}
    */
-  @Output() submitForm: EventEmitter<any> = new EventEmitter();
+  uploadFilesOptions: UploaderOptions = Object.assign(new UploaderOptions(), {
+    autoUpload: false
+  });
 
-  public constructor(private location: Location,
-                     private formService: DynamicFormService,
-                     private translate: TranslateService) {
+  /**
+   * Emits DSO and Uploader when the form is submitted
+   */
+  @Output() submitForm: EventEmitter<{
+    dso: T,
+    uploader: FileUploader,
+    deleteLogo: boolean
+  }> = new EventEmitter();
+
+  /**
+   * Fires an event when the logo has finished uploading (with or without errors) or was removed
+   */
+  @Output() finish: EventEmitter<any> = new EventEmitter();
+
+  /**
+   * Observable keeping track whether or not the uploader has finished initializing
+   * Used to start rendering the uploader component
+   */
+  initializedUploaderOptions = new BehaviorSubject(false);
+
+  /**
+   * Is the logo marked to be deleted?
+   */
+  markLogoForDeletion = false;
+
+  /**
+   * Array to track all subscriptions and unsubscribe them onDestroy
+   * @type {Array}
+   */
+  protected subs: Subscription[] = [];
+
+  /**
+   * The service used to fetch from or send data to
+   */
+  protected dsoService: ComColDataService<Community | Collection>;
+
+  public constructor(protected location: Location,
+                     protected formService: DynamicFormService,
+                     protected translate: TranslateService,
+                     protected notificationsService: NotificationsService,
+                     protected authService: AuthService,
+                     protected requestService: RequestService,
+                     protected objectCache: ObjectCacheService) {
   }
 
   ngOnInit(): void {
@@ -76,13 +141,56 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit {
       .subscribe(() => {
         this.updateFieldTranslations();
       });
+
+    if (hasValue(this.dso.id)) {
+      this.subs.push(
+        observableCombineLatest(
+          this.dsoService.getLogoEndpoint(this.dso.id),
+          (this.dso as any).logo
+        ).subscribe(([href, logoRD]: [string, RemoteData<Bitstream>]) => {
+          this.uploadFilesOptions.url = href;
+          this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
+          // If the object already contains a logo, send out a PUT request instead of POST for setting a new logo
+          if (hasValue(logoRD.payload)) {
+            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.
+      this.uploadFilesOptions.url = 'placeholder';
+      this.uploadFilesOptions.authToken = this.authService.buildAuthHeader();
+      this.initializedUploaderOptions.next(true);
+    }
   }
 
   /**
    * Checks which new fields were added and sends the updated version of the DSO to the parent component
    */
   onSubmit() {
-    const formMetadata = new Object() as MetadataMap;
+    if (this.markLogoForDeletion && hasValue(this.dso.id)) {
+      this.dsoService.deleteLogo(this.dso).subscribe((response: RestResponse) => {
+        if (response.isSuccessful) {
+          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')
+          );
+        } else {
+          const errorResponse = response as ErrorResponse;
+          this.notificationsService.error(
+            this.translate.get(this.type.value + '.edit.logo.notifications.delete.error.title'),
+            errorResponse.errorMessage
+          );
+        }
+        (this.dso as any).logo = undefined;
+        this.uploadFilesOptions.method = RestRequestMethod.POST;
+        this.refreshCache();
+        this.finish.emit();
+      });
+    }
+
+    const formMetadata = {}  as MetadataMap;
     this.formModel.forEach((fieldModel: DynamicInputModel) => {
       const value: MetadataValue = {
           value: fieldModel.value as string,
@@ -102,7 +210,11 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit {
       },
       type: Community.type
     });
-    this.submitForm.emit(updatedDSO);
+    this.submitForm.emit({
+      dso: updatedDSO,
+      uploader: hasValue(this.uploaderComponent) ? this.uploaderComponent.uploader : undefined,
+      deleteLogo: this.markLogoForDeletion
+    });
   }
 
   /**
@@ -122,7 +234,59 @@ export class ComColFormComponent<T extends DSpaceObject> implements OnInit {
     );
   }
 
+  /**
+   * Mark the logo to be deleted
+   * Send out a delete request to remove the logo from the community/collection and display notifications
+   */
+  deleteLogo() {
+    this.markLogoForDeletion = true;
+  }
+
+  /**
+   * Undo marking the logo to be deleted
+   */
+  undoDeleteLogo() {
+    this.markLogoForDeletion = false;
+  }
+
+  /**
+   * Refresh the object's cache to ensure the latest version
+   */
+  private refreshCache() {
+    this.requestService.removeByHrefSubstring(this.dso.self);
+    this.objectCache.remove(this.dso.self);
+  }
+
+  /**
+   * The request was successful, display a success notification
+   */
+  public onCompleteItem() {
+    this.refreshCache();
+    this.notificationsService.success(null, this.translate.get(this.type.value + '.edit.logo.notifications.add.success'));
+    this.finish.emit();
+  }
+
+  /**
+   * The request was unsuccessful, display an error notification
+   */
+  public onUploadError() {
+    this.notificationsService.error(null, this.translate.get(this.type.value + '.edit.logo.notifications.add.error'));
+    this.finish.emit();
+  }
+
+  /**
+   * Cancel the form and return to the previous page
+   */
   onCancel() {
     this.location.back();
   }
+
+  /**
+   * Unsubscribe from open subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((subscription) => hasValue(subscription))
+      .forEach((subscription) => subscription.unsubscribe());
+  }
 }
diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
index 6ad2e5b5e1..717979891f 100644
--- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
+++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.spec.ts
@@ -11,11 +11,13 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { CreateComColPageComponent } from './create-comcol-page.component';
-import { DataService } from '../../../core/data/data.service';
 import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject$
 } from '../../testing/utils';
+import { ComColDataService } from '../../../core/data/comcol-data.service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { NotificationsServiceStub } from '../../testing/notifications-service-stub';
 
 describe('CreateComColPageComponent', () => {
   let comp: CreateComColPageComponent<DSpaceObject>;
@@ -31,6 +33,8 @@ describe('CreateComColPageComponent', () => {
   let routeServiceStub;
   let routerStub;
 
+  const logoEndpoint = 'rest/api/logo/endpoint';
+
   function initializeVars() {
     community = Object.assign(new Community(), {
       uuid: 'a20da287-e174-466a-9926-f66b9300d347',
@@ -56,8 +60,8 @@ describe('CreateComColPageComponent', () => {
           value: community.name
         }]
       })),
-      create: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity)
-
+      create: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity),
+      getLogoEndpoint: () => observableOf(logoEndpoint)
     };
 
     routeServiceStub = {
@@ -74,10 +78,11 @@ describe('CreateComColPageComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
       providers: [
-        { provide: DataService, useValue: communityDataServiceStub },
+        { provide: ComColDataService, useValue: communityDataServiceStub },
         { provide: CommunityDataService, useValue: communityDataServiceStub },
         { provide: RouteService, useValue: routeServiceStub },
         { provide: Router, useValue: routerStub },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -86,6 +91,7 @@ describe('CreateComColPageComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(CreateComColPageComponent);
     comp = fixture.componentInstance;
+    (comp as any).type = Community.type;
     fixture.detectChanges();
     dsoDataService = (comp as any).dsoDataService;
     communityDataService = (comp as any).communityDataService;
@@ -95,27 +101,86 @@ describe('CreateComColPageComponent', () => {
 
   describe('onSubmit', () => {
     let data;
-    beforeEach(() => {
-      data = Object.assign(new Community(), {
-        metadata: [{
-          key: 'dc.title',
-          value: 'test'
-        }]
+
+    describe('with an empty queue in the uploader', () => {
+      beforeEach(() => {
+        data = {
+          dso: Object.assign(new Community(), {
+            metadata: [{
+              key: 'dc.title',
+              value: 'test'
+            }]
+          }),
+          uploader: {
+            options: {
+              url: ''
+            },
+            queue: [],
+            /* tslint:disable:no-empty */
+            uploadAll: () => {}
+            /* tslint:enable:no-empty */
+          }
+        };
+      });
+
+      it('should navigate when successful', () => {
+        spyOn(router, 'navigate');
+        comp.onSubmit(data);
+        fixture.detectChanges();
+        expect(router.navigate).toHaveBeenCalled();
+      });
+
+      it('should not navigate on failure', () => {
+        spyOn(router, 'navigate');
+        spyOn(dsoDataService, 'create').and.returnValue(createFailedRemoteDataObject$(newCommunity));
+        comp.onSubmit(data);
+        fixture.detectChanges();
+        expect(router.navigate).not.toHaveBeenCalled();
       });
     });
-    it('should navigate when successful', () => {
-      spyOn(router, 'navigate');
-      comp.onSubmit(data);
-      fixture.detectChanges();
-      expect(router.navigate).toHaveBeenCalled();
-    });
 
-    it('should not navigate on failure', () => {
-      spyOn(router, 'navigate');
-      spyOn(dsoDataService, 'create').and.returnValue(createFailedRemoteDataObject$(newCommunity));
-      comp.onSubmit(data);
-      fixture.detectChanges();
-      expect(router.navigate).not.toHaveBeenCalled();
+    describe('with at least one item in the uploader\'s queue', () => {
+      beforeEach(() => {
+        data = {
+          dso: Object.assign(new Community(), {
+            metadata: [{
+              key: 'dc.title',
+              value: 'test'
+            }]
+          }),
+          uploader: {
+            options: {
+              url: ''
+            },
+            queue: [
+              {}
+            ],
+            /* tslint:disable:no-empty */
+            uploadAll: () => {}
+            /* tslint:enable:no-empty */
+          }
+        };
+      });
+
+      it('should not navigate', () => {
+        spyOn(router, 'navigate');
+        comp.onSubmit(data);
+        fixture.detectChanges();
+        expect(router.navigate).not.toHaveBeenCalled();
+      });
+
+      it('should set the uploader\'s url to the logo\'s endpoint', () => {
+        comp.onSubmit(data);
+        fixture.detectChanges();
+        expect(data.uploader.options.url).toEqual(logoEndpoint);
+      });
+
+      it('should call the uploader\'s uploadAll', () => {
+        spyOn(data.uploader, 'uploadAll');
+        comp.onSubmit(data);
+        fixture.detectChanges();
+        expect(data.uploader.uploadAll).toHaveBeenCalled();
+      });
     });
   });
 });
diff --git a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
index e07f2a5a0a..7b23c59498 100644
--- a/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
+++ b/src/app/shared/comcol-forms/create-comcol-page/create-comcol-page.component.ts
@@ -3,13 +3,17 @@ import { Community } from '../../../core/shared/community.model';
 import { CommunityDataService } from '../../../core/data/community-data.service';
 import { Observable } from 'rxjs';
 import { RouteService } from '../../../core/services/route.service';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { RemoteData } from '../../../core/data/remote-data';
-import { isNotEmpty, isNotUndefined } from '../../empty.util';
+import { hasValue, isNotEmpty, isNotUndefined } from '../../empty.util';
 import { take } from 'rxjs/operators';
 import { getSucceededRemoteData } from '../../../core/shared/operators';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { DataService } from '../../../core/data/data.service';
+import { ComColDataService } from '../../../core/data/comcol-data.service';
+import { NotificationsService } from '../../notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
+import { ResourceType } from '../../../core/shared/resource-type';
 
 /**
  * Component representing the create page for communities and collections
@@ -34,11 +38,23 @@ export class CreateComColPageComponent<TDomain extends DSpaceObject> implements
    */
   public parentRD$: Observable<RemoteData<Community>>;
 
+  /**
+   * The UUID of the newly created object
+   */
+  private newUUID: string;
+
+  /**
+   * The type of the dso
+   */
+  protected type: ResourceType;
+
   public constructor(
-    protected dsoDataService: DataService<TDomain>,
+    protected dsoDataService: ComColDataService<TDomain>,
     protected parentDataService: CommunityDataService,
     protected routeService: RouteService,
-    protected router: Router
+    protected router: Router,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService
   ) {
 
   }
@@ -53,20 +69,40 @@ export class CreateComColPageComponent<TDomain extends DSpaceObject> implements
   }
 
   /**
-   * @param {TDomain} dso The updated version of the DSO
    * Creates a new DSO based on the submitted user data and navigates to the new object's home page
+   * @param event   The event returned by the community/collection form. Contains the new dso and logo uploader
    */
-  onSubmit(dso: TDomain) {
+  onSubmit(event) {
+    const dso = event.dso;
+    const uploader = event.uploader;
+
     this.parentUUID$.pipe(take(1)).subscribe((uuid: string) => {
       this.dsoDataService.create(dso, uuid)
         .pipe(getSucceededRemoteData())
         .subscribe((dsoRD: RemoteData<TDomain>) => {
           if (isNotUndefined(dsoRD)) {
-            const newUUID = dsoRD.payload.uuid;
-            this.router.navigate([this.frontendURL + newUUID]);
+            this.newUUID = dsoRD.payload.uuid;
+            if (uploader.queue.length > 0) {
+              this.dsoDataService.getLogoEndpoint(this.newUUID).pipe(take(1)).subscribe((href: string) => {
+                uploader.options.url = href;
+                uploader.uploadAll();
+              });
+            } else {
+              this.navigateToNewPage();
+            }
+            this.notificationsService.success(null, this.translate.get(this.type.value + '.create.notifications.success'));
           }
         });
     });
   }
 
+  /**
+   * Navigate to the page of the newly created object
+   */
+  navigateToNewPage() {
+    if (hasValue(this.newUUID)) {
+      this.router.navigate([this.frontendURL + this.newUUID]);
+    }
+  }
+
 }
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
index 26002d555d..5711aa4e70 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.spec.ts
@@ -12,6 +12,10 @@ import { RouterTestingModule } from '@angular/router/testing';
 import { DataService } from '../../../../core/data/data.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { ComcolMetadataComponent } from './comcol-metadata.component';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject$ } from '../../../testing/utils';
+import { ComColDataService } from '../../../../core/data/comcol-data.service';
+import { NotificationsServiceStub } from '../../../testing/notifications-service-stub';
+import { NotificationsService } from '../../../notifications/notifications.service';
 
 describe('ComColMetadataComponent', () => {
   let comp: ComcolMetadataComponent<DSpaceObject>;
@@ -25,6 +29,8 @@ describe('ComColMetadataComponent', () => {
   let routerStub;
   let routeStub;
 
+  const logoEndpoint = 'rest/api/logo/endpoint';
+
   function initializeVars() {
     community = Object.assign(new Community(), {
       uuid: 'a20da287-e174-466a-9926-f66b9300d347',
@@ -43,8 +49,8 @@ describe('ComColMetadataComponent', () => {
     });
 
     communityDataServiceStub = {
-      update: (com, uuid?) => observableOf(new RemoteData(false, false, true, undefined, newCommunity))
-
+      update: (com, uuid?) => createSuccessfulRemoteDataObject$(newCommunity),
+      getLogoEndpoint: () => observableOf(logoEndpoint)
     };
 
     routerStub = {
@@ -53,7 +59,9 @@ describe('ComColMetadataComponent', () => {
 
     routeStub = {
       parent: {
-        data: observableOf(community)
+        data: observableOf({
+          dso: new RemoteData(false, false, true, null, community)
+        })
       }
     };
 
@@ -64,9 +72,10 @@ describe('ComColMetadataComponent', () => {
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), SharedModule, CommonModule, RouterTestingModule],
       providers: [
-        { provide: DataService, useValue: communityDataServiceStub },
+        { provide: ComColDataService, useValue: communityDataServiceStub },
         { provide: Router, useValue: routerStub },
         { provide: ActivatedRoute, useValue: routeStub },
+        { provide: NotificationsService, useValue: new NotificationsServiceStub() }
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents();
@@ -75,6 +84,7 @@ describe('ComColMetadataComponent', () => {
   beforeEach(() => {
     fixture = TestBed.createComponent(ComcolMetadataComponent);
     comp = fixture.componentInstance;
+    (comp as any).type = Community.type;
     fixture.detectChanges();
     dsoDataService = (comp as any).dsoDataService;
     router = (comp as any).router;
@@ -82,27 +92,98 @@ describe('ComColMetadataComponent', () => {
 
   describe('onSubmit', () => {
     let data;
-    beforeEach(() => {
-      data = Object.assign(new Community(), {
-        metadata: [{
-          key: 'dc.title',
-          value: 'test'
-        }]
+
+    describe('with an empty queue in the uploader', () => {
+      beforeEach(() => {
+        data = {
+          dso: Object.assign(new Community(), {
+            metadata: [{
+              key: 'dc.title',
+              value: 'test'
+            }]
+          }),
+          uploader: {
+            options: {
+              url: ''
+            },
+            queue: [],
+            /* tslint:disable:no-empty */
+            uploadAll: () => {}
+            /* tslint:enable:no-empty */
+          }
+        }
+      });
+
+      it('should navigate when successful', () => {
+        spyOn(router, 'navigate');
+        comp.onSubmit(data);
+        fixture.detectChanges();
+        expect(router.navigate).toHaveBeenCalled();
+      });
+
+      it('should not navigate on failure', () => {
+        spyOn(router, 'navigate');
+        spyOn(dsoDataService, 'update').and.returnValue(createFailedRemoteDataObject$(newCommunity));
+        comp.onSubmit(data);
+        fixture.detectChanges();
+        expect(router.navigate).not.toHaveBeenCalled();
       });
     });
-    it('should navigate when successful', () => {
-      spyOn(router, 'navigate');
-      comp.onSubmit(data);
-      fixture.detectChanges();
-      expect(router.navigate).toHaveBeenCalled();
-    });
 
-    it('should not navigate on failure', () => {
-      spyOn(router, 'navigate');
-      spyOn(dsoDataService, 'update').and.returnValue(observableOf(new RemoteData(true, true, false, undefined, newCommunity)));
-      comp.onSubmit(data);
-      fixture.detectChanges();
-      expect(router.navigate).not.toHaveBeenCalled();
+    describe('with at least one item in the uploader\'s queue', () => {
+      beforeEach(() => {
+        data = {
+          dso: Object.assign(new Community(), {
+            metadata: [{
+              key: 'dc.title',
+              value: 'test'
+            }]
+          }),
+          uploader: {
+            options: {
+              url: ''
+            },
+            queue: [
+              {}
+            ],
+            /* tslint:disable:no-empty */
+            uploadAll: () => {}
+            /* tslint:enable:no-empty */
+          }
+        }
+      });
+
+      it('should not navigate', () => {
+        spyOn(router, 'navigate');
+        comp.onSubmit(data);
+        fixture.detectChanges();
+        expect(router.navigate).not.toHaveBeenCalled();
+      });
+
+      it('should set the uploader\'s url to the logo\'s endpoint', () => {
+        comp.onSubmit(data);
+        fixture.detectChanges();
+        expect(data.uploader.options.url).toEqual(logoEndpoint);
+      });
+
+      it('should call the uploader\'s uploadAll', () => {
+        spyOn(data.uploader, 'uploadAll');
+        comp.onSubmit(data);
+        fixture.detectChanges();
+        expect(data.uploader.uploadAll).toHaveBeenCalled();
+      });
     });
   });
+
+  describe('navigateToHomePage', () => {
+    beforeEach(() => {
+      spyOn(router, 'navigate');
+      comp.navigateToHomePage();
+    });
+
+    it('should navigate', () => {
+      expect(router.navigate).toHaveBeenCalled();
+    });
+  });
+
 });
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
index 3806da5a84..1031fead10 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/comcol-metadata/comcol-metadata.component.ts
@@ -3,10 +3,14 @@ import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
 import { Observable } from 'rxjs/internal/Observable';
 import { RemoteData } from '../../../../core/data/remote-data';
 import { ActivatedRoute, Router } from '@angular/router';
-import { first, map } from 'rxjs/operators';
+import { first, map, take } from 'rxjs/operators';
 import { getSucceededRemoteData } from '../../../../core/shared/operators';
-import { isNotUndefined } from '../../../empty.util';
+import { hasValue, isNotUndefined } from '../../../empty.util';
 import { DataService } from '../../../../core/data/data.service';
+import { ResourceType } from '../../../../core/shared/resource-type';
+import { ComColDataService } from '../../../../core/data/comcol-data.service';
+import { NotificationsService } from '../../../notifications/notifications.service';
+import { TranslateService } from '@ngx-translate/core';
 
 @Component({
   selector: 'ds-comcol-metadata',
@@ -17,13 +21,22 @@ export class ComcolMetadataComponent<TDomain extends DSpaceObject> implements On
    * Frontend endpoint for this type of DSO
    */
   protected frontendURL: string;
-
+  /**
+   * The initial DSO object
+   */
   public dsoRD$: Observable<RemoteData<TDomain>>;
 
+  /**
+   * The type of the dso
+   */
+  protected type: ResourceType;
+
   public constructor(
-    protected dsoDataService: DataService<TDomain>,
+    protected dsoDataService: ComColDataService<TDomain>,
     protected router: Router,
-    protected route: ActivatedRoute
+    protected route: ActivatedRoute,
+    protected notificationsService: NotificationsService,
+    protected translate: TranslateService
   ) {
   }
 
@@ -32,17 +45,41 @@ export class ComcolMetadataComponent<TDomain extends DSpaceObject> implements On
   }
 
   /**
-   * @param {TDomain} dso The updated version of the DSO
    * Updates an existing DSO based on the submitted user data and navigates to the edited object's home page
+   * @param event   The event returned by the community/collection form. Contains the new dso and logo uploader
    */
-  onSubmit(dso: TDomain) {
+  onSubmit(event) {
+    const dso = event.dso;
+    const uploader = event.uploader;
+    const deleteLogo = event.deleteLogo;
+
     this.dsoDataService.update(dso)
       .pipe(getSucceededRemoteData())
       .subscribe((dsoRD: RemoteData<TDomain>) => {
         if (isNotUndefined(dsoRD)) {
           const newUUID = dsoRD.payload.uuid;
-          this.router.navigate([this.frontendURL + newUUID]);
+          if (hasValue(uploader) && uploader.queue.length > 0) {
+            this.dsoDataService.getLogoEndpoint(newUUID).pipe(take(1)).subscribe((href: string) => {
+              uploader.options.url = href;
+              uploader.uploadAll();
+            });
+          } else if (!deleteLogo) {
+            this.router.navigate([this.frontendURL + newUUID]);
+          }
+          this.notificationsService.success(null, this.translate.get(this.type.value + '.edit.notifications.success'));
         }
       });
   }
+
+  /**
+   * Navigate to the home page of the object
+   */
+  navigateToHomePage() {
+    this.dsoRD$.pipe(
+      getSucceededRemoteData(),
+      take(1)
+    ).subscribe((dsoRD: RemoteData<TDomain>) => {
+      this.router.navigate([this.frontendURL + dsoRD.payload.id]);
+      });
+  }
 }
diff --git a/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts b/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
index b1b37f265e..0f9d4c55b4 100644
--- a/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
+++ b/src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.ts
@@ -19,7 +19,7 @@ export class EditComColPageComponent<TDomain extends DSpaceObject> implements On
   /**
    * The type of DSpaceObject (used to create i18n messages)
    */
-  protected type: string;
+  public type: string;
 
   /**
    * The current page outlet string
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 234f13f4b1..2de59d614b 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
@@ -2,14 +2,14 @@ import { async, ComponentFixture, TestBed } 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 '../../../+search-page/search-service/search.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
-import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model';
 import { ItemSearchResult } from '../../object-collection/shared/item-search-result.model';
 import { Item } from '../../../core/shared/item.model';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { MetadataValue } from '../../../core/shared/metadata.models';
 import { createSuccessfulRemoteDataObject$ } from '../../testing/utils';
+import { PaginatedSearchOptions } from '../../search/paginated-search-options.model';
 
 describe('DSOSelectorComponent', () => {
   let component: DSOSelectorComponent;
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 af26f3f04f..3c9d399f8b 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
@@ -12,12 +12,12 @@ import { FormControl } from '@angular/forms';
 
 import { Observable } from 'rxjs';
 import { debounceTime, startWith, switchMap } from 'rxjs/operators';
-import { SearchService } from '../../../+search-page/search-service/search.service';
-import { PaginatedSearchOptions } from '../../../+search-page/paginated-search-options.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { PaginatedSearchOptions } from '../../search/paginated-search-options.model';
 import { DSpaceObjectType } from '../../../core/shared/dspace-object-type.model';
 import { RemoteData } from '../../../core/data/remote-data';
 import { PaginatedList } from '../../../core/data/paginated-list';
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { ViewMode } from '../../../core/shared/view-mode.model';
 
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 2c9b2499ab..b3058ab879 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
@@ -59,9 +59,8 @@ describe('CreateItemParentSelectorComponent', () => {
   });
 
   it('should call navigate on the router with the correct create path when navigate is called', () => {
-    /* TODO when there is a specific submission path */
-    // component.navigate(item);
-    // expect(router.navigate).toHaveBeenCalledWith([createPath]);
+    component.navigate(collection);
+    expect(router.navigate).toHaveBeenCalledWith(['/submit'], { queryParams: { collection: collection.uuid } });
   });
 
 });
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 29af9f624e..02a0bd79cd 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,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { ActivatedRoute, Router } from '@angular/router';
+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';
@@ -28,6 +28,11 @@ export class CreateItemParentSelectorComponent extends DSOSelectorModalWrapperCo
    * Navigate to the item create page
    */
   navigate(dso: DSpaceObject) {
-   // There's no submit path per collection yet...
+    const navigationExtras: NavigationExtras = {
+      queryParams: {
+        ['collection']: dso.uuid,
+      }
+    };
+    this.router.navigate(['/submit'], navigationExtras);
   }
 }
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 52a924604f..a31171d7ef 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
@@ -9,37 +9,59 @@
 
     <ng-container *ngTemplateOutlet="startTemplate?.templateRef; context: model"></ng-container>
 
-  <div [ngClass]="{'form-row': model.hasLanguages }">
-    <div [ngClass]="getClass('grid', 'control')">
+    <div [ngClass]="{'form-row': model.hasLanguages || hasRelationLookup }">
+        <div [ngClass]="getClass('grid', 'control')">
 
-      <ng-container #componentViewContainer></ng-container>
+            <ng-container #componentViewContainer></ng-container>
 
-      <small *ngIf="hasHint && (!showErrorMessages || errorMessages.length === 0)"
-             class="text-muted" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
+            <small *ngIf="hasHint && (!showErrorMessages || errorMessages.length === 0)"
+                   class="text-muted" [innerHTML]="model.hint | translate" [ngClass]="getClass('element', 'hint')"></small>
 
-      <div *ngIf="showErrorMessages" [ngClass]="[getClass('element', 'errors'), getClass('grid', 'errors')]">
-        <small *ngFor="let message of errorMessages" class="invalid-feedback d-block">{{ message | translate:model.validators }}</small>
-      </div>
+            <div *ngIf="showErrorMessages" [ngClass]="[getClass('element', 'errors'), getClass('grid', 'errors')]">
+                <small *ngFor="let message of errorMessages" class="invalid-feedback d-block">{{ message | translate:model.validators }}</small>
+            </div>
 
+        </div>
+
+        <div *ngIf="model.languageCodes && model.languageCodes.length > 0" class="col-xs-2">
+            <select
+                    #language="ngModel"
+                    [disabled]="model.readOnly"
+                    [(ngModel)]="model.language"
+                    class="form-control"
+                    (blur)="onBlur($event)"
+                    (change)="onChangeLanguage($event)"
+                    [ngModelOptions]="{standalone: true}"
+                    required>
+                <option *ngFor="let lang of model.languageCodes" [value]="lang.code">{{lang.display}}</option>
+            </select>
+        </div>
+
+        <div *ngIf="hasRelationLookup" class="col-auto text-center">
+            <button class="btn btn-secondary"
+                    type="submit"
+                    ngbTooltip="{{'form.lookup-help' | translate}}"
+                    placement="top"
+                    (click)="openLookup(); $event.stopPropagation();">{{'form.lookup' | translate}}
+            </button>
+        </div>
     </div>
 
-    <div *ngIf="model.languageCodes && model.languageCodes.length > 0" class="col-xs-2">
-      <select
-        #language="ngModel"
-        [disabled]="model.readOnly"
-        [(ngModel)]="model.language"
-        class="form-control"
-        (blur)="onBlur($event)"
-        (change)="onChangeLanguage($event)"
-        [ngModelOptions]="{standalone: true}"
-        required>
-        <option *ngFor="let lang of model.languageCodes" [value]="lang.code">{{lang.display}}</option>
-      </select>
-    </div>
-  </div>
-
     <ng-container *ngTemplateOutlet="endTemplate?.templateRef; context: model"></ng-container>
 
     <ng-content></ng-content>
 
+
+    <div *ngIf="hasRelationLookup" class="mt-3">
+        <ul class="list-unstyled" cdkDropList (cdkDropListDropped)="moveSelection($event)">
+            <ds-existing-metadata-list-element cdkDrag
+                                               *ngFor="let reorderable of reorderables; trackBy: trackReorderable"
+                                               [reoRel]="reorderable"
+                                               [submissionItem]="item"
+                                               [listId]="listId"
+                                               [metadataFields]="model.metadataFields"
+                                               [relationshipOptions]="model.relationship">
+            </ds-existing-metadata-list-element>
+        </ul>
+    </div>
 </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 13a9ba4e85..91c1dbc085 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,5 +1,5 @@
 import { async, ComponentFixture, inject, TestBed } from '@angular/core/testing';
-import { CUSTOM_ELEMENTS_SCHEMA, DebugElement, SimpleChange } from '@angular/core';
+import { CUSTOM_ELEMENTS_SCHEMA, DebugElement, NgZone, SimpleChange } from '@angular/core';
 import { FormControl, FormGroup, FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { BrowserDynamicTestingModule } from '@angular/platform-browser-dynamic/testing';
 import { By } from '@angular/platform-browser';
@@ -39,10 +39,7 @@ import {
 } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateModule } from '@ngx-translate/core';
 
-import {
-  DsDynamicFormControlContainerComponent,
-  dsDynamicFormControlMapFn
-} from './ds-dynamic-form-control-container.component';
+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';
@@ -65,6 +62,15 @@ import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-a
 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 { RelationshipService } from '../../../../core/data/relationship.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 '../../../testing/utils';
 
 describe('DsDynamicFormControlContainerComponent test suite', () => {
 
@@ -95,12 +101,15 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
     new DynamicSwitchModel({ id: 'switch' }),
     new DynamicTextAreaModel({ id: 'textarea' }),
     new DynamicTimePickerModel({ id: 'timepicker' }),
-    new DynamicTypeaheadModel({ id: 'typeahead' }),
+    new DynamicTypeaheadModel({ id: 'typeahead', metadataFields: [], repeatable: false, submissionId: '1234' }),
     new DynamicScrollableDropdownModel({
       id: 'scrollableDropdown',
-      authorityOptions: authorityOptions
+      authorityOptions: authorityOptions,
+      metadataFields: [],
+      repeatable: false,
+      submissionId: '1234'
     }),
-    new DynamicTagModel({ id: 'tag' }),
+    new DynamicTagModel({ id: 'tag', metadataFields: [], repeatable: false, submissionId: '1234' }),
     new DynamicListCheckboxGroupModel({
       id: 'checkboxList',
       authorityOptions: authorityOptions,
@@ -112,18 +121,21 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
       repeatable: false
     }),
     new DynamicRelationGroupModel({
+      submissionId: '1234',
       id: 'relationGroup',
       formConfiguration: [],
       mandatoryField: '',
       name: 'relationGroup',
       relationFields: [],
       scopeUUID: '',
-      submissionScope: ''
+      submissionScope: '',
+      repeatable: false,
+      metadataFields: []
     }),
     new DynamicDsDatePickerModel({ id: 'datepicker' }),
-    new DynamicLookupModel({ id: 'lookup' }),
-    new DynamicLookupNameModel({ id: 'lookupName' }),
-    new DynamicQualdropModel({ id: 'combobox', readOnly: false })
+    new DynamicLookupModel({ id: 'lookup', metadataFields: [], repeatable: false, submissionId: '1234' }),
+    new DynamicLookupNameModel({ id: 'lookupName', metadataFields: [], repeatable: false, submissionId: '1234' }),
+    new DynamicQualdropModel({ id: 'combobox', readOnly: false, required: false })
   ];
   const testModel = formModel[8];
   let formGroup: FormGroup;
@@ -131,7 +143,9 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
   let component: DsDynamicFormControlContainerComponent;
   let debugElement: DebugElement;
   let testElement: DebugElement;
-
+  const testItem: Item = new Item();
+  const testWSI: WorkspaceItem = new WorkspaceItem();
+  testWSI.item = observableOf(createSuccessfulRemoteDataObject(testItem));
   beforeEach(async(() => {
 
     TestBed.overrideModule(BrowserDynamicTestingModule, {
@@ -150,14 +164,34 @@ describe('DsDynamicFormControlContainerComponent test suite', () => {
         DynamicFormsCoreModule.forRoot(),
         SharedModule,
         TranslateModule.forRoot(),
-        TextMaskModule
+        TextMaskModule,
+      ],
+      providers: [
+        DsDynamicFormControlContainerComponent,
+        DynamicFormService,
+        { provide: RelationshipService, useValue: {} },
+        { provide: SelectableListService, useValue: {} },
+        { provide: ItemDataService, useValue: {} },
+        { provide: Store, useValue: {} },
+        { provide: RelationshipService, useValue: {} },
+        { provide: SelectableListService, useValue: {} },
+        {
+          provide: SubmissionObjectDataService,
+          useValue: {
+            findById: () => observableOf(createSuccessfulRemoteDataObject(testWSI))
+          }
+        },
+        { provide: NgZone, useValue: new NgZone({}) }
       ],
-      providers: [DsDynamicFormControlContainerComponent, DynamicFormService],
       schemas: [CUSTOM_ELEMENTS_SCHEMA]
     }).compileComponents().then(() => {
 
       fixture = TestBed.createComponent(DsDynamicFormControlContainerComponent);
 
+      const ngZone = TestBed.get(NgZone);
+
+      // tslint:disable-next-line:ban-types
+      spyOn(ngZone, 'runOutsideAngular').and.callFake((fn: Function) => fn());
       component = fixture.componentInstance;
       debugElement = fixture.debugElement;
     });
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 455c1075ef..22376502e7 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
@@ -1,11 +1,14 @@
 import {
-  ChangeDetectionStrategy,
+  ChangeDetectionStrategy, ChangeDetectorRef,
   Component,
   ComponentFactoryResolver,
   ContentChildren,
   EventEmitter,
   Input,
+  NgZone,
   OnChanges,
+  OnDestroy,
+  OnInit,
   Output,
   QueryList,
   SimpleChanges,
@@ -30,7 +33,7 @@ import {
   DynamicFormControl,
   DynamicFormControlContainerComponent,
   DynamicFormControlEvent,
-  DynamicFormControlModel,
+  DynamicFormControlModel, DynamicFormInstancesService,
   DynamicFormLayout,
   DynamicFormLayoutService,
   DynamicFormValidationService,
@@ -47,6 +50,10 @@ import {
   DynamicNGBootstrapTimePickerComponent
 } from '@ng-dynamic-forms/ui-ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
+import {
+  Reorderable,
+  ReorderableRelationship
+} from './existing-metadata-list-element/existing-metadata-list-element.component';
 
 import { DYNAMIC_FORM_CONTROL_TYPE_TYPEAHEAD } from './models/typeahead/dynamic-typeahead.model';
 import { DYNAMIC_FORM_CONTROL_TYPE_SCROLLABLE_DROPDOWN } from './models/scrollable-dropdown/dynamic-scrollable-dropdown.model';
@@ -55,7 +62,7 @@ import { DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER } from './models/date-picker/dat
 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 { isNotEmpty, isNotUndefined } from '../../../empty.util';
+import { 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';
@@ -68,10 +75,31 @@ import { DsDynamicFormArrayComponent } from './models/array-group/dynamic-form-a
 import { DsDynamicRelationGroupComponent } from './models/relation-group/dynamic-relation-group.components';
 import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from './models/relation-group/dynamic-relation-group.model';
 import { DsDatePickerInlineComponent } from './models/date-picker-inline/dynamic-date-picker-inline.component';
+import { map, startWith, switchMap, find } from 'rxjs/operators';
+import { combineLatest as observableCombineLatest, Observable, of as observableOf, Subscription } from 'rxjs';
+import { SearchResult } from '../../../search/search-result.model';
+import { DSpaceObject } from '../../../../core/shared/dspace-object.model';
+import { NgbModal, NgbModalRef } from '@ng-bootstrap/ng-bootstrap';
+import { RelationshipService } from '../../../../core/data/relationship.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 { getAllSucceededRemoteData, getRemoteDataPayload, getSucceededRemoteData } 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';
+import { ItemSearchResult } from '../../../object-collection/shared/item-search-result.model';
+import { CdkDragDrop, moveItemInArray } from '@angular/cdk/drag-drop';
+import { Relationship } from '../../../../core/shared/item-relationships/relationship.model';
 
 export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<DynamicFormControl> | null {
   switch (model.type) {
-
     case DYNAMIC_FORM_CONTROL_TYPE_ARRAY:
       return DsDynamicFormArrayComponent;
 
@@ -125,6 +153,9 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
     case DYNAMIC_FORM_CONTROL_TYPE_LOOKUP_NAME:
       return DsDynamicLookupComponent;
 
+    case DYNAMIC_FORM_CONTROL_TYPE_DISABLED:
+      return DsDynamicDisabledComponent;
+
     default:
       return null;
   }
@@ -136,8 +167,7 @@ export function dsDynamicFormControlMapFn(model: DynamicFormControlModel): Type<
   templateUrl: './ds-dynamic-form-control-container.component.html',
   changeDetection: ChangeDetectionStrategy.Default
 })
-export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent implements OnChanges {
-
+export class DsDynamicFormControlContainerComponent extends DynamicFormControlContainerComponent implements OnInit, OnChanges, OnDestroy {
   @ContentChildren(DynamicTemplateDirective) contentTemplateList: QueryList<DynamicTemplateDirective>;
   // tslint:disable-next-line:no-input-rename
   @Input('templates') inputTemplateList: QueryList<DynamicTemplateDirective>;
@@ -150,6 +180,18 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   @Input() hasErrorMessaging = false;
   @Input() layout = null as DynamicFormLayout;
   @Input() model: any;
+  reorderables$: Observable<ReorderableRelationship[]>;
+  reorderables: ReorderableRelationship[];
+  hasRelationLookup: boolean;
+  modalRef: NgbModalRef;
+  item: Item;
+  listId: string;
+  searchConfig: string;
+
+  /**
+   * List of subscriptions to unsubscribe from
+   */
+  private subs: Subscription[] = [];
 
   /* tslint:disable:no-output-rename */
   @Output('dfBlur') blur: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
@@ -157,7 +199,7 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
   @Output('dfFocus') focus: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   @Output('ngbEvent') customEvent: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
   /* tslint:enable:no-output-rename */
-  @ViewChild('componentViewContainer', {read: ViewContainerRef}) componentViewContainerRef: ViewContainerRef;
+  @ViewChild('componentViewContainer', { read: ViewContainerRef }) componentViewContainerRef: ViewContainerRef;
 
   private showErrorMessagesPreviousStage: boolean;
 
@@ -165,15 +207,85 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
     return this.layoutService.getCustomComponentType(this.model) || dsDynamicFormControlMapFn(this.model);
   }
 
-  protected test: boolean;
   constructor(
     protected componentFactoryResolver: ComponentFactoryResolver,
+    protected dynamicFormInstanceService: DynamicFormInstancesService,
     protected layoutService: DynamicFormLayoutService,
     protected validationService: DynamicFormValidationService,
-    protected translateService: TranslateService
+    protected translateService: TranslateService,
+    private modalService: NgbModal,
+    private relationService: RelationshipService,
+    private selectableListService: SelectableListService,
+    private itemService: ItemDataService,
+    private relationshipService: RelationshipService,
+    private zone: NgZone,
+    private store: Store<AppState>,
+    private submissionObjectService: SubmissionObjectDataService,
+    private ref: ChangeDetectorRef
   ) {
 
-    super(componentFactoryResolver, layoutService, validationService);
+    super(componentFactoryResolver, layoutService, validationService, dynamicFormInstanceService);
+  }
+
+  /**
+   * Sets up the necessary variables for when this control can be used to add relationships to the submitted item
+   */
+  ngOnInit(): void {
+    this.hasRelationLookup = hasValue(this.model.relationship);
+    this.reorderables = [];
+    if (this.hasRelationLookup) {
+
+      this.listId = 'list-' + this.model.relationship.relationshipType;
+      const item$ = this.submissionObjectService
+        .findById(this.model.submissionId).pipe(
+          getAllSucceededRemoteData(),
+          getRemoteDataPayload(),
+          switchMap((submissionObject: SubmissionObject) => (submissionObject.item as Observable<RemoteData<Item>>)
+            .pipe(
+              getAllSucceededRemoteData(),
+              getRemoteDataPayload()
+            )
+          )
+        );
+
+      this.subs.push(item$.subscribe((item) => this.item = item));
+      this.reorderables$ = item$.pipe(
+        switchMap((item) => this.relationService.getItemRelationshipsByLabel(item, this.model.relationship.relationshipType)
+          .pipe(
+            getAllSucceededRemoteData(),
+            getRemoteDataPayload(),
+            map((relationshipList: PaginatedList<Relationship>) => relationshipList.page),
+            startWith([]),
+            switchMap((relationships: Relationship[]) =>
+              observableCombineLatest(
+                relationships.map((relationship: Relationship) =>
+                  relationship.leftItem.pipe(
+                    getSucceededRemoteData(),
+                    getRemoteDataPayload(),
+                    map((leftItem: Item) => {
+                      return new ReorderableRelationship(relationship, leftItem.uuid !== this.item.uuid)
+                    }),
+                  )
+                ))),
+            map((relationships: ReorderableRelationship[]) =>
+              relationships
+                .sort((a: Reorderable, b: Reorderable) => {
+                  return Math.sign(a.getPlace() - b.getPlace());
+                })
+            )
+          )
+        )
+      );
+
+      this.subs.push(this.reorderables$.subscribe((rs) => {
+        this.reorderables = rs;
+        this.ref.detectChanges();
+      }));
+
+      this.relationService.getRelatedItemsByLabel(this.item, this.model.relationship.relationshipType).pipe(
+        map((items: RemoteData<PaginatedList<Item>>) => items.payload.page.map((item) => Object.assign(new ItemSearchResult(), { indexableObject: item }))),
+      ).subscribe((relatedItems: Array<SearchResult<Item>>) => this.selectableListService.select(this.listId, relatedItems));
+    }
   }
 
   ngOnChanges(changes: SimpleChanges) {
@@ -212,4 +324,66 @@ export class DsDynamicFormControlContainerComponent extends DynamicFormControlCo
       this.onChange(event);
     }
   }
+
+  public hasResultsSelected(): Observable<boolean> {
+    return this.model.value.pipe(map((list: Array<SearchResult<DSpaceObject>>) => isNotEmpty(list)));
+  }
+
+  /**
+   * Open a modal where the user can select relationships to be added to item being submitted
+   */
+  openLookup() {
+    this.modalRef = this.modalService.open(DsDynamicLookupRelationModalComponent, {
+      size: 'lg'
+    });
+    const modalComp = this.modalRef.componentInstance;
+    modalComp.repeatable = this.model.repeatable;
+    modalComp.listId = this.listId;
+    modalComp.relationshipOptions = this.model.relationship;
+    modalComp.label = this.model.label;
+    modalComp.metadataFields = this.model.metadataFields;
+    modalComp.item = this.item;
+  }
+
+  /**
+   * Method to move a relationship inside the list of relationships
+   * This will update the view and update the right or left place field of the relationships in the list
+   * @param event
+   */
+  moveSelection(event: CdkDragDrop<Relationship>) {
+    this.zone.runOutsideAngular(() => {
+      moveItemInArray(this.reorderables, event.previousIndex, event.currentIndex);
+      const reorderables: Reorderable[] = this.reorderables.map((reo: Reorderable, index: number) => {
+          reo.oldIndex = reo.getPlace();
+          reo.newIndex = index;
+          return reo;
+        }
+      );
+      observableCombineLatest(
+        reorderables.map((rel: ReorderableRelationship) => {
+          if (rel.oldIndex !== rel.newIndex) {
+            return this.relationshipService.updatePlace(rel);
+          } else {
+            return observableOf(undefined) as Observable<RemoteData<Relationship>>;
+          }
+        })
+      ).subscribe();
+    })
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+  /**
+   * Prevent unnecessary rerendering so fields don't lose focus
+   */
+  trackReorderable(index, reorderable: Reorderable) {
+    return hasValue(reorderable) ? reorderable.getId() : undefined;
+  }
 }
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
new file mode 100644
index 0000000000..960dd78767
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.html
@@ -0,0 +1,11 @@
+<li *ngIf="metadataRepresentation">
+    <button type="button" class="close float-left" aria-label="Move button" cdkDragHandle>
+        <i aria-hidden="true" class="fas fa-arrows-alt fa-xs"></i>
+    </button>
+    <button type="button" class="close float-left" aria-label="Close button" (click)="removeSelection()">
+        <span aria-hidden="true">&times;</span>
+    </button>
+    <span class="d-inline-block align-middle ml-1">
+              <ds-metadata-representation-loader [mdRepresentation]="metadataRepresentation"></ds-metadata-representation-loader>
+          </span>
+</li>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.scss
new file mode 100644
index 0000000000..e69de29bb2
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
new file mode 100644
index 0000000000..fa13febcd1
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.spec.ts
@@ -0,0 +1,92 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ExistingMetadataListElementComponent, Reorderable, 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 { select, Store } from '@ngrx/store';
+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 '../../../../testing/utils';
+import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+
+describe('ExistingMetadataListElementComponent', () => {
+  let component: ExistingMetadataListElementComponent;
+  let fixture: ComponentFixture<ExistingMetadataListElementComponent>;
+  let selectionService;
+  let store;
+  let listID;
+  let submissionItem;
+  let relationship;
+  let reoRel;
+  let metadataFields;
+  let relationshipOptions;
+  let uuid1;
+  let uuid2;
+  let relatedItem;
+  let leftItemRD$;
+  let rightItemRD$;
+  let relatedSearchResult;
+
+  function init() {
+    uuid1 = '91ce578d-2e63-4093-8c73-3faafd716000';
+    uuid2 = '0e9dba1c-e1c3-4e05-a539-446f08ef57a7';
+    selectionService = jasmine.createSpyObj('selectionService', ['deselectSingle']);
+    store = jasmine.createSpyObj('store', ['dispatch']);
+    listID = '1234-listID';
+    submissionItem = Object.assign(new Item(), { uuid: uuid1 });
+    metadataFields = ['dc.contributor.author'];
+    relationshipOptions = Object.assign(new RelationshipOptions(), { relationshipType: 'isPublicationOfAuthor', filter: 'test.filter', searchConfiguration: 'personConfiguration', nameVariants: true })
+    relatedItem = Object.assign(new Item(), { uuid: uuid2 });
+    leftItemRD$ = createSuccessfulRemoteDataObject$(relatedItem);
+    rightItemRD$ = createSuccessfulRemoteDataObject$(submissionItem);
+    relatedSearchResult = Object.assign(new ItemSearchResult(), { indexableObject: relatedItem });
+
+    relationship = Object.assign(new Relationship(), { leftItem: leftItemRD$, rightItem: rightItemRD$ });
+    reoRel = new ReorderableRelationship(relationship, true);
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [ExistingMetadataListElementComponent],
+      providers: [
+        { provide: SelectableListService, useValue: selectionService },
+        { provide: Store, useValue: store },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ExistingMetadataListElementComponent);
+    component = fixture.componentInstance;
+    component.listId = listID;
+    component.submissionItem = submissionItem;
+    component.reoRel = reoRel;
+    component.metadataFields = metadataFields;
+    component.relationshipOptions = relationshipOptions;
+    fixture.detectChanges();
+    component.ngOnChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('removeSelection', () => {
+    it('should deselect the object in the selectable list service', () => {
+      component.removeSelection();
+      expect(selectionService.deselectSingle).toHaveBeenCalledWith(listID, relatedSearchResult);
+    });
+
+    it('should dispatch a RemoveRelationshipAction', () => {
+      component.removeSelection();
+      const action = new RemoveRelationshipAction(submissionItem, relatedItem, relationshipOptions.relationshipType);
+      expect(store.dispatch).toHaveBeenCalledWith(action);
+
+    });
+  })
+});
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
new file mode 100644
index 0000000000..09aaa253c6
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component.ts
@@ -0,0 +1,123 @@
+import { Component, Input, OnChanges, OnDestroy, OnInit } from '@angular/core';
+import { Item } from '../../../../../core/shared/item.model';
+import { MetadataRepresentation } from '../../../../../core/shared/metadata-representation/metadata-representation.model';
+import { getAllSucceededRemoteData, getRemoteDataPayload } from '../../../../../core/shared/operators';
+import { hasValue, isNotEmpty } from '../../../../empty.util';
+import { Subscription } from 'rxjs';
+import { filter } from 'rxjs/operators';
+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 { RelationshipOptions } from '../../models/relationship-options.model';
+import { RemoveRelationshipAction } from '../relation-lookup-modal/relationship.actions';
+import { SelectableListService } from '../../../../object-list/selectable-list/selectable-list.service';
+import { Store } from '@ngrx/store';
+import { AppState } from '../../../../../app.reducer';
+import { ItemSearchResult } from '../../../../object-collection/shared/item-search-result.model';
+
+// tslint:disable:max-classes-per-file
+/**
+ * Abstract class that defines objects that can be reordered
+ */
+export abstract class Reorderable {
+  constructor(public oldIndex?: number, public newIndex?: number) {
+  }
+
+  abstract getId(): string;
+
+  abstract getPlace(): number;
+}
+
+/**
+ * Represents a single relationship that can be reordered in a list of multiple relationships
+ */
+export class ReorderableRelationship extends Reorderable {
+  relationship: Relationship;
+  useLeftItem: boolean;
+
+  constructor(relationship: Relationship, useLeftItem: boolean, oldIndex?: number, newIndex?: number) {
+    super(oldIndex, newIndex);
+    this.relationship = relationship;
+    this.useLeftItem = useLeftItem;
+  }
+
+  getId(): string {
+    return this.relationship.id;
+  }
+
+  getPlace(): number {
+    if (this.useLeftItem) {
+      return this.relationship.rightPlace
+    } else {
+      return this.relationship.leftPlace
+    }
+  }
+}
+
+/**
+ * Represents a single existing relationship value as metadata in submission
+ */
+@Component({
+  selector: 'ds-existing-metadata-list-element',
+  templateUrl: './existing-metadata-list-element.component.html',
+  styleUrls: ['./existing-metadata-list-element.component.scss']
+})
+export class ExistingMetadataListElementComponent implements OnChanges, OnDestroy {
+  @Input() listId: string;
+  @Input() submissionItem: Item;
+  @Input() reoRel: ReorderableRelationship;
+  @Input() metadataFields: string[];
+  @Input() relationshipOptions: RelationshipOptions;
+  metadataRepresentation: MetadataRepresentation;
+  relatedItem: Item;
+
+  /**
+   * List of subscriptions to unsubscribe from
+   */
+  private subs: Subscription[] = [];
+
+  constructor(
+    private selectableListService: SelectableListService,
+    private store: Store<AppState>
+  ) {
+  }
+
+  ngOnChanges() {
+    const item$ = this.reoRel.useLeftItem ?
+      this.reoRel.relationship.leftItem : this.reoRel.relationship.rightItem;
+    this.subs.push(item$.pipe(
+      getAllSucceededRemoteData(),
+      getRemoteDataPayload(),
+      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 });
+      if (hasValue(relationMD)) {
+        const metadataRepresentationMD: MetadataValue = this.submissionItem.firstMetadata(this.metadataFields, { authority: relationMD.authority });
+        this.metadataRepresentation = Object.assign(
+          new ItemMetadataRepresentation(metadataRepresentationMD),
+          this.relatedItem
+        )
+      }
+    }));
+  }
+
+  /**
+   * Removes the selected relationship from the list
+   */
+  removeSelection() {
+    this.selectableListService.deselectSingle(this.listId, Object.assign(new ItemSearchResult(), { indexableObject: this.relatedItem }));
+    this.store.dispatch(new RemoveRelationshipAction(this.submissionItem, this.relatedItem, this.relationshipOptions.relationshipType))
+  }
+
+  /**
+   * Unsubscribe from all subscriptions
+   */
+  ngOnDestroy(): void {
+    this.subs
+      .filter((sub) => hasValue(sub))
+      .forEach((sub) => sub.unsubscribe());
+  }
+
+}
+// tslint:enable:max-classes-per-file
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 214e2d1907..995fcbf350 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
@@ -1,5 +1,10 @@
-import { DynamicDateControlModel, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
-import { DynamicDateControlModelConfig } from '@ng-dynamic-forms/core/src/model/dynamic-date-control.model';
+import {
+  DynamicDateControlModel,
+  DynamicDateControlModelConfig,
+  DynamicFormControlLayout,
+  serializable
+} from '@ng-dynamic-forms/core';
+
 import { Subject } from 'rxjs';
 
 export const DYNAMIC_FORM_CONTROL_TYPE_DSDATEPICKER = 'DATE';
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
new file mode 100644
index 0000000000..18fddd1446
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.html
@@ -0,0 +1,13 @@
+<div>
+    <div class="form-row align-items-center">
+        <div class="col">
+            <input class="form-control"
+                   [class.is-invalid]="showErrorMessages"
+                   [value]="modelValuesString"
+                   [disabled]="model.disabled"
+                   [type]="model.inputType"
+                   [placeholder]="model.placeholder | translate"
+                   [readonly]="model.readOnly">
+        </div>
+    </div>
+</div>
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
new file mode 100644
index 0000000000..8e0c6fc20e
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.spec.ts
@@ -0,0 +1,58 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { DsDynamicDisabledComponent } from './dynamic-disabled.component';
+import { FormsModule } from '@angular/forms';
+import { DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import { DynamicDisabledModel } from './dynamic-disabled.model';
+import { By } from '@angular/platform-browser';
+import { TranslateModule } from '@ngx-translate/core';
+
+describe('DsDynamicDisabledComponent', () => {
+  let comp: DsDynamicDisabledComponent;
+  let fixture: ComponentFixture<DsDynamicDisabledComponent>;
+  let de: DebugElement;
+  let el: HTMLElement;
+  let model;
+
+  function init() {
+    model = new DynamicDisabledModel({ value: 'test', repeatable: false, metadataFields: [], submissionId: '1234', id: '1' });
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [DsDynamicDisabledComponent],
+      imports: [FormsModule, TranslateModule.forRoot()],
+      providers: [
+        {
+          provide: DynamicFormLayoutService,
+          useValue: {}
+        },
+        {
+          provide: DynamicFormValidationService,
+          useValue: {}
+        }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsDynamicDisabledComponent);
+    comp = fixture.componentInstance; // DsDynamicDisabledComponent test instance
+    de = fixture.debugElement;
+    el = de.nativeElement;
+    comp.model = model;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(comp).toBeTruthy();
+  });
+
+  it('should have a disabled input', () => {
+    const input = de.query(By.css('input'));
+    console.log(input.nativeElement.getAttribute('disabled'));
+    expect(input.nativeElement.getAttribute('disabled')).toEqual('');
+  });
+});
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
new file mode 100644
index 0000000000..9032cb48cb
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component.ts
@@ -0,0 +1,33 @@
+import { Component, EventEmitter, Input, Output } from '@angular/core';
+
+import { DynamicFormControlComponent, DynamicFormLayoutService, DynamicFormValidationService } from '@ng-dynamic-forms/core';
+import { FormGroup } from '@angular/forms';
+import { DynamicDisabledModel } from './dynamic-disabled.model';
+
+/**
+ * Component representing a simple disabled input field
+ */
+@Component({
+  selector: 'ds-dynamic-disabled',
+  templateUrl: './dynamic-disabled.component.html'
+})
+/**
+ * Component for displaying a form input with a disabled property
+ */
+export class DsDynamicDisabledComponent extends DynamicFormControlComponent {
+
+  @Input() formId: string;
+  @Input() group: FormGroup;
+  @Input() model: DynamicDisabledModel;
+  modelValuesString = '';
+
+  @Output() blur: EventEmitter<any> = new EventEmitter<any>();
+  @Output() change: EventEmitter<any> = new EventEmitter<any>();
+  @Output() focus: EventEmitter<any> = new EventEmitter<any>();
+
+  constructor(protected layoutService: DynamicFormLayoutService,
+              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
new file mode 100644
index 0000000000..0fa2b3e5ed
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.model.ts
@@ -0,0 +1,24 @@
+import { DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
+import { DsDynamicInputModel, DsDynamicInputModelConfig } from '../ds-dynamic-input.model';
+
+export const DYNAMIC_FORM_CONTROL_TYPE_DISABLED = 'EMPTY';
+
+export interface DsDynamicDisabledModelConfig extends DsDynamicInputModelConfig {
+  value?: any;
+}
+
+/**
+ * This model represents the data for a disabled input field
+ */
+export class DynamicDisabledModel extends DsDynamicInputModel {
+
+  @serializable() readonly type: string = DYNAMIC_FORM_CONTROL_TYPE_DISABLED;
+  @serializable() value: any;
+
+  constructor(config: DsDynamicDisabledModelConfig, layout?: DynamicFormControlLayout) {
+    super(config, layout);
+    this.readOnly = true;
+    this.disabled = true;
+    this.valueUpdates.next(config.value);
+  }
+}
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 66bdf97dad..af05d5bf35 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
@@ -5,6 +5,7 @@ import { Subject } from 'rxjs';
 import { isNotEmpty } from '../../../../empty.util';
 import { DsDynamicInputModel } from './ds-dynamic-input.model';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
+import { RelationshipOptions } from '../../models/relationship-options.model';
 
 export const CONCAT_GROUP_SUFFIX = '_CONCAT_GROUP';
 export const CONCAT_FIRST_INPUT_SUFFIX = '_CONCAT_FIRST_INPUT';
@@ -12,12 +13,24 @@ export const CONCAT_SECOND_INPUT_SUFFIX = '_CONCAT_SECOND_INPUT';
 
 export interface DynamicConcatModelConfig extends DynamicFormGroupModelConfig {
   separator: string;
+  value?: any;
+  relationship?: RelationshipOptions;
+  repeatable: boolean;
+  required: boolean;
+  metadataFields: string[];
+  submissionId: string;
 }
 
 export class DynamicConcatModel extends DynamicFormGroupModel {
 
   @serializable() separator: string;
   @serializable() hasLanguages = false;
+  @serializable() relationship?: RelationshipOptions;
+  @serializable() repeatable?: boolean;
+  @serializable() required?: boolean;
+  @serializable() metadataFields: string[];
+  @serializable() submissionId: string;
+
   isCustomGroup = true;
   valueUpdates: Subject<string>;
 
@@ -26,6 +39,11 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
     super(config, layout);
 
     this.separator = config.separator + ' ';
+    this.relationship = config.relationship;
+    this.repeatable = config.repeatable;
+    this.required = config.required;
+    this.metadataFields = config.metadataFields;
+    this.submissionId = config.submissionId;
 
     this.valueUpdates = new Subject<string>();
     this.valueUpdates.subscribe((value: string) => this.value = value);
@@ -49,7 +67,7 @@ export class DynamicConcatModel extends DynamicFormGroupModel {
     let tempValue: string;
 
     if (typeof value === 'string') {
-      tempValue =  value;
+      tempValue = value;
     } else {
       tempValue = value.value;
     }
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 4e4a944319..3827df7be6 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
@@ -1,21 +1,21 @@
-import {
-  DynamicFormControlLayout,
-  DynamicInputModel,
-  DynamicInputModelConfig,
-  serializable
-} from '@ng-dynamic-forms/core';
+import { DynamicFormControlLayout, DynamicInputModel, DynamicInputModelConfig, serializable } from '@ng-dynamic-forms/core';
 import { Subject } from 'rxjs';
 
 import { LanguageCode } from '../../models/form-field-language-value.model';
 import { AuthorityOptions } from '../../../../../core/integration/models/authority-options.model';
 import { hasValue } from '../../../../empty.util';
 import { FormFieldMetadataValueObject } from '../../models/form-field-metadata-value.model';
+import { RelationshipOptions } from '../../models/relationship-options.model';
 
 export interface DsDynamicInputModelConfig extends DynamicInputModelConfig {
   authorityOptions?: AuthorityOptions;
   languageCodes?: LanguageCode[];
   language?: string;
   value?: any;
+  relationship?: RelationshipOptions;
+  repeatable: boolean;
+  metadataFields: string[];
+  submissionId: string;
 }
 
 export class DsDynamicInputModel extends DynamicInputModel {
@@ -24,13 +24,21 @@ export class DsDynamicInputModel extends DynamicInputModel {
   @serializable() private _languageCodes: LanguageCode[];
   @serializable() private _language: string;
   @serializable() languageUpdates: Subject<string>;
+  @serializable() relationship?: RelationshipOptions;
+  @serializable() repeatable?: boolean;
+  @serializable() metadataFields: string[];
+  @serializable() submissionId: string;
 
   constructor(config: DsDynamicInputModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
-
+    this.repeatable = config.repeatable;
+    this.metadataFields = config.metadataFields;
     this.hint = config.hint;
     this.readOnly = config.readOnly;
     this.value = config.value;
+    this.relationship = config.relationship;
+    this.submissionId = config.submissionId;
+
     this.language = config.language;
     if (!this.language) {
       // TypeAhead
@@ -79,5 +87,4 @@ export class DsDynamicInputModel extends DynamicInputModel {
       this.language = this.languageCodes ? this.languageCodes[0].code : null;
     }
   }
-
 }
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 5d2cbc58b7..c7fc3f2f2b 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
@@ -1,7 +1,12 @@
-import { DynamicFormControlLayout, DynamicFormGroupModel, serializable } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlLayout,
+  DynamicFormGroupModel,
+  DynamicFormGroupModelConfig,
+  serializable
+} from '@ng-dynamic-forms/core';
 import { DsDynamicInputModel } from './ds-dynamic-input.model';
 import { Subject } from 'rxjs';
-import { DynamicFormGroupModelConfig } from '@ng-dynamic-forms/core/src/model/form-group/dynamic-form-group.model';
+
 import { LanguageCode } from '../../models/form-field-language-value.model';
 
 export const QUALDROP_GROUP_SUFFIX = '_QUALDROP_GROUP';
@@ -12,6 +17,7 @@ export interface DsDynamicQualdropModelConfig extends DynamicFormGroupModelConfi
   languageCodes?: LanguageCode[];
   language?: string;
   readOnly: boolean;
+  required: boolean;
   hint?: string;
 }
 
@@ -22,12 +28,14 @@ export class DynamicQualdropModel extends DynamicFormGroupModel {
   @serializable() hasLanguages = false;
   @serializable() readOnly: boolean;
   @serializable() hint: string;
+  @serializable() required: boolean;
   isCustomGroup = true;
 
   constructor(config: DsDynamicQualdropModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
 
     this.readOnly = config.readOnly;
+    this.required = config.required;
     this.language = config.language;
     this.languageCodes = config.languageCodes;
 
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 b91af8f0c9..7de319bf56 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
@@ -1,21 +1,18 @@
-import {
-  DYNAMIC_FORM_CONTROL_TYPE_ARRAY,
-  DynamicFormArrayModel, DynamicFormArrayModelConfig, DynamicFormControlLayout,
-  serializable
-} from '@ng-dynamic-forms/core';
-import { DYNAMIC_FORM_CONTROL_TYPE_TAG } from './tag/dynamic-tag.model';
+import { DynamicFormArrayModel, DynamicFormArrayModelConfig, DynamicFormControlLayout, serializable } from '@ng-dynamic-forms/core';
 
 export interface DynamicRowArrayModelConfig extends DynamicFormArrayModelConfig {
   notRepeatable: boolean;
+  required: boolean;
 }
 
 export class DynamicRowArrayModel extends DynamicFormArrayModel {
   @serializable() notRepeatable = false;
+  @serializable() required = false;
   isRowArray = true;
 
   constructor(config: DynamicRowArrayModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
     this.notRepeatable = config.notRepeatable;
+    this.required = config.required;
   }
-
 }
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 39c2c61efe..b0ed3a1dc2 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
@@ -27,6 +27,8 @@ import { AuthorityConfidenceStateDirective } from '../../../../../authority-conf
 import { ObjNgFor } from '../../../../../utils/object-ngfor.pipe';
 import { GLOBAL_CONFIG, GlobalConfig } from '../../../../../../../config';
 import { MOCK_SUBMISSION_CONFIG } from '../../../../../testing/mock-submission-config';
+import { WorkspaceitemsEditPageModule } from '../../../../../../+workspaceitems-edit-page/workspaceitems-edit-page.module';
+import { WorkspaceItem } from '../../../../../../core/submission/models/workspaceitem.model';
 
 let LOOKUP_TEST_MODEL_CONFIG = {
   authorityOptions: {
@@ -47,7 +49,9 @@ let LOOKUP_TEST_MODEL_CONFIG = {
   repeatable: true,
   separator: ',',
   validators: { required: null },
-  value: undefined
+  value: undefined,
+  metadataFields: [],
+  submissionId: '1234'
 };
 
 let LOOKUP_NAME_TEST_MODEL_CONFIG = {
@@ -69,7 +73,9 @@ let LOOKUP_NAME_TEST_MODEL_CONFIG = {
   repeatable: true,
   separator: ',',
   validators: { required: null },
-  value: undefined
+  value: undefined,
+  metadataFields: [],
+  submissionId: '1234'
 };
 
 let LOOKUP_TEST_GROUP = new FormGroup({
@@ -100,7 +106,9 @@ describe('Dynamic Lookup component', () => {
       repeatable: true,
       separator: ',',
       validators: { required: null },
-      value: undefined
+      value: undefined,
+      metadataFields: [],
+      submissionId: '1234'
     };
 
     LOOKUP_NAME_TEST_MODEL_CONFIG = {
@@ -122,7 +130,9 @@ describe('Dynamic Lookup component', () => {
       repeatable: true,
       separator: ',',
       validators: { required: null },
-      value: undefined
+      value: undefined,
+      metadataFields: [],
+      submissionId: '1234'
     };
 
     LOOKUP_TEST_GROUP = new FormGroup({
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 6d5839f867..75d30d9d79 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
@@ -33,6 +33,8 @@ export let FORM_GROUP_TEST_GROUP;
 
 const config: GlobalConfig = MOCK_SUBMISSION_CONFIG;
 
+const submissionId = '1234';
+
 function init() {
   FORM_GROUP_TEST_MODEL_CONFIG = {
     disabled: false,
@@ -67,6 +69,7 @@ function init() {
         }]
       } as FormFieldModel]
     } as FormRowModel],
+    submissionId,
     id: 'dc_contributor_author',
     label: 'Authors',
     mandatoryField: 'dc.contributor.author',
@@ -77,7 +80,9 @@ function init() {
     required: true,
     scopeUUID: '43fe1f8c-09a6-4fcf-9c78-5d4fed8f2c8f',
     submissionScope: undefined,
-    validators: { required: null }
+    validators: { required: null },
+    repeatable: false,
+    metadataFields: []
   } as DynamicRelationGroupModelConfig;
 
   FORM_GROUP_TEST_GROUP = new FormGroup({
@@ -183,7 +188,7 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
 
     it('should init component properly', inject([FormBuilderService], (service: FormBuilderService) => {
       const formConfig = { rows: groupComp.model.formConfiguration } as SubmissionFormsModel;
-      const formModel = service.modelFromConfiguration(formConfig, groupComp.model.scopeUUID, {}, groupComp.model.submissionScope, groupComp.model.readOnly);
+      const formModel = service.modelFromConfiguration(submissionId, formConfig, groupComp.model.scopeUUID, {}, groupComp.model.submissionScope, groupComp.model.readOnly);
       const chips = new Chips([], 'value', 'dc.contributor.author');
       groupComp.formCollapsed.subscribe((value) => {
         expect(value).toEqual(false);
@@ -257,11 +262,11 @@ describe('DsDynamicRelationGroupComponent test suite', () => {
 
     it('should init component properly', inject([FormBuilderService], (service: FormBuilderService) => {
       const formConfig = { rows: groupComp.model.formConfiguration } as SubmissionFormsModel;
-      const formModel = service.modelFromConfiguration(formConfig, groupComp.model.scopeUUID, {}, groupComp.model.submissionScope, groupComp.model.readOnly);
+      const formModel = service.modelFromConfiguration(submissionId, formConfig, groupComp.model.scopeUUID, {}, groupComp.model.submissionScope, groupComp.model.readOnly);
       const chips = new Chips(modelValue, 'value', 'dc.contributor.author');
       groupComp.formCollapsed.subscribe((value) => {
         expect(value).toEqual(true);
-      })
+      });
       expect(groupComp.formModel.length).toEqual(formModel.length);
       expect(groupComp.chips.getChipsItems()).toEqual(chips.getChipsItems());
     }));
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 62b6b4effa..ea62eeb4ce 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
@@ -93,6 +93,7 @@ export class DsDynamicRelationGroupComponent extends DynamicFormControlComponent
 
     this.formId = this.formService.getUniqueId(this.model.id);
     this.formModel = this.formBuilderService.modelFromConfiguration(
+      this.model.submissionId,
       config,
       this.model.scopeUUID,
       {},
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 e6d2b95afc..c1f76f0431 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
@@ -10,6 +10,7 @@ export const PLACEHOLDER_PARENT_METADATA = '#PLACEHOLDER_PARENT_METADATA_VALUE#'
  * Dynamic Group Model configuration interface
  */
 export interface DynamicRelationGroupModelConfig extends DsDynamicInputModelConfig {
+  submissionId: string,
   formConfiguration: FormRowModel[],
   mandatoryField: string,
   relationFields: string[],
@@ -21,6 +22,7 @@ export interface DynamicRelationGroupModelConfig extends DsDynamicInputModelConf
  * Dynamic Group Model class
  */
 export class DynamicRelationGroupModel extends DsDynamicInputModel {
+  @serializable() submissionId: string;
   @serializable() formConfiguration: FormRowModel[];
   @serializable() mandatoryField: string;
   @serializable() relationFields: string[];
@@ -32,6 +34,7 @@ export class DynamicRelationGroupModel extends DsDynamicInputModel {
   constructor(config: DynamicRelationGroupModelConfig, layout?: DynamicFormControlLayout) {
     super(config, layout);
 
+    this.submissionId = config.submissionId;
     this.formConfiguration = config.formConfiguration;
     this.mandatoryField = config.mandatoryField;
     this.relationFields = config.relationFields;
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 2bcb42a73a..ab923a58fa 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
@@ -38,7 +38,9 @@ export const SD_TEST_MODEL_CONFIG = {
   readOnly: false,
   required: false,
   repeatable: false,
-  value: undefined
+  value: undefined,
+  metadataFields: [],
+  submissionId: '1234'
 };
 
 describe('Dynamic Dynamic Scrollable Dropdown component', () => {
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
new file mode 100644
index 0000000000..46620aa00b
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.html
@@ -0,0 +1,59 @@
+<div class="modal-header">
+    <h4 class="modal-title" id="modal-title">{{ ('submission.sections.describe.relationship-lookup.title.' + label) | translate }}</h4>
+    <button type="button" class="close" aria-label="Close button" aria-describedby="modal-title"
+            (click)="modal.dismiss()">
+        <span aria-hidden="true">&times;</span>
+    </button>
+</div>
+<div class="modal-body">
+    <ngb-tabset>
+        <ngb-tab [title]="'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + label | translate  : {count: (totalInternal$ | async)}">
+            <ng-template ngbTabContent>
+                <ds-dynamic-lookup-relation-search-tab
+                        [selection$]="selection$"
+                        [listId]="listId"
+                        [relationship]="relationshipOptions"
+                        [repeatable]="repeatable"
+                        [context]="context"
+                        (selectObject)="select($event)"
+                        (deselectObject)="deselect($event)"
+                        class="d-block pt-3">
+                </ds-dynamic-lookup-relation-search-tab>
+            </ng-template>
+        </ngb-tab>
+        <ngb-tab *ngFor="let source of (externalSourcesRD$ | async)?.payload?.page; let idx = index"
+                 [title]="'submission.sections.describe.relationship-lookup.search-tab.tab-title.' + source.id | translate  : {count: (totalExternal$ | async)[idx]}">
+            <ng-template ngbTabContent>
+                <ds-dynamic-lookup-relation-external-source-tab
+                        [listId]="listId"
+                        [repeatable]="repeatable"
+                        [context]="context"
+                        [externalSource]="source"
+                        (selectObject)="select($event)"
+                        (deselectObject)="deselect($event)"
+                        class="d-block pt-3">
+                </ds-dynamic-lookup-relation-external-source-tab>
+            </ng-template>
+        </ngb-tab>
+        <ngb-tab [title]="'submission.sections.describe.relationship-lookup.selection-tab.tab-title' | translate : {count: (selection$ | async)?.length}">
+            <ng-template ngbTabContent>
+                <ds-dynamic-lookup-relation-selection-tab
+                        [selection$]="selection$"
+                        [listId]="listId"
+                        [label]="label"
+                        [repeatable]="repeatable"
+                        [context]="context"
+                        (selectObject)="select($event)"
+                        (deselectObject)="deselect($event)"
+                        class="d-block pt-3">
+                </ds-dynamic-lookup-relation-selection-tab>
+            </ng-template>
+        </ngb-tab>
+    </ngb-tabset>
+</div>
+<div class="modal-footer">
+    <small>{{ ('submission.sections.describe.relationship-lookup.selected' | translate:{size: (selection$ | async)?.length || 0}) }}</small>
+    <div>
+        <button type="button" class="btn btn-danger" (click)="close()">{{ ('submission.sections.describe.relationship-lookup.close' | translate) }}</button>
+    </div>
+</div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.scss
new file mode 100644
index 0000000000..4fb77a7590
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.scss
@@ -0,0 +1,3 @@
+.modal-footer {
+    justify-content: space-between;
+}
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
new file mode 100644
index 0000000000..d1b289bf11
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.spec.ts
@@ -0,0 +1,168 @@
+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+import { TranslateModule } from '@ngx-translate/core';
+import { RouterTestingModule } from '@angular/router/testing';
+import { 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 { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+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/paginated-search-options.model';
+import { ExternalSource } from '../../../../../core/shared/external-source.model';
+import { createPaginatedList, createSuccessfulRemoteDataObject$ } from '../../../../testing/utils';
+import { ExternalSourceService } from '../../../../../core/data/external-source.service';
+import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
+
+describe('DsDynamicLookupRelationModalComponent', () => {
+  let component: DsDynamicLookupRelationModalComponent;
+  let fixture: ComponentFixture<DsDynamicLookupRelationModalComponent>;
+  let item;
+  let item1;
+  let item2;
+  let searchResult1;
+  let searchResult2;
+  let listID;
+  let selection$;
+  let selectableListService;
+  let relationship;
+  let nameVariant;
+  let metadataField;
+  let pSearchOptions;
+  let externalSourceService;
+  let lookupRelationService;
+
+  const externalSources = [
+    Object.assign(new ExternalSource(), {
+      id: 'orcidV2',
+      name: 'orcidV2',
+      hierarchical: false
+    }),
+    Object.assign(new ExternalSource(), {
+      id: 'sherpaPublisher',
+      name: 'sherpaPublisher',
+      hierarchical: false
+    })
+  ];
+  const totalLocal = 10;
+  const totalExternal = 8;
+
+  function init() {
+    item = Object.assign(new Item(), { uuid: '7680ca97-e2bd-4398-bfa7-139a8673dc42', metadata: {} });
+    item1 = Object.assign(new Item(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
+    item2 = Object.assign(new Item(), { uuid: 'c8279647-1acc-41ae-b036-951d5f65649b' });
+    searchResult1 = Object.assign(new ItemSearchResult(), { indexableObject: item1 });
+    searchResult2 = Object.assign(new ItemSearchResult(), { indexableObject: item2 });
+    listID = '6b0c8221-fcb4-47a8-b483-ca32363fffb3';
+    selection$ = observableOf([searchResult1, searchResult2]);
+    selectableListService = { getSelectableList: () => selection$ };
+    relationship = { filter: 'filter', relationshipType: 'isAuthorOfPublication', nameVariants: true } as RelationshipOptions;
+    nameVariant = 'Doe, J.';
+    metadataField = 'dc.contributor.author';
+    pSearchOptions = new PaginatedSearchOptions({});
+    externalSourceService = jasmine.createSpyObj('externalSourceService', {
+      findAll: createSuccessfulRemoteDataObject$(createPaginatedList(externalSources))
+    });
+    lookupRelationService = jasmine.createSpyObj('lookupRelationService', {
+      getTotalLocalResults: observableOf(totalLocal),
+      getTotalExternalResults: observableOf(totalExternal)
+    });
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [DsDynamicLookupRelationModalComponent],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NgbModule.forRoot()],
+      providers: [
+        {
+          provide: SearchConfigurationService, useValue: {
+            paginatedSearchOptions: observableOf(pSearchOptions)
+          }
+        },
+        { provide: ExternalSourceService, useValue: externalSourceService },
+        { provide: LookupRelationService, useValue: lookupRelationService },
+        {
+          provide: SelectableListService, useValue: selectableListService
+        },
+        {
+          provide: RelationshipService, useValue: { getNameVariant: () => observableOf(nameVariant) }
+        },
+        { provide: RelationshipTypeService, useValue: {} },
+        {
+          provide: Store, useValue: {
+            // tslint:disable-next-line:no-empty
+            dispatch: () => {}
+          }
+        },
+        { provide: NgZone, useValue: new NgZone({}) },
+        NgbActiveModal
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsDynamicLookupRelationModalComponent);
+    component = fixture.componentInstance;
+    component.listId = listID;
+    component.relationshipOptions = relationship;
+    component.item = item;
+    component.metadataFields = metadataField;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('close', () => {
+    beforeEach(() => {
+      spyOn(component.modal, 'close');
+    });
+
+    it('should call close on the modal', () => {
+      component.close();
+      expect(component.modal.close).toHaveBeenCalled();
+    })
+  });
+
+  describe('select', () => {
+    beforeEach(() => {
+      spyOn((component as any).store, 'dispatch');
+    });
+
+    it('should dispatch an AddRelationshipAction for each selected object', () => {
+      component.select(searchResult1, searchResult2);
+      const action = new AddRelationshipAction(component.item, searchResult1.indexableObject, relationship.relationshipType, nameVariant);
+      const action2 = new AddRelationshipAction(component.item, searchResult2.indexableObject, relationship.relationshipType, nameVariant);
+
+      expect((component as any).store.dispatch).toHaveBeenCalledWith(action);
+      expect((component as any).store.dispatch).toHaveBeenCalledWith(action2);
+    })
+  });
+
+  describe('deselect', () => {
+    beforeEach(() => {
+      component.subMap[searchResult1.indexableObject.uuid] = new Subscription();
+      component.subMap[searchResult2.indexableObject.uuid] = new Subscription();
+      spyOn((component as any).store, 'dispatch');
+    });
+
+    it('should dispatch an RemoveRelationshipAction for each deselected object', () => {
+      component.deselect(searchResult1, searchResult2);
+      const action = new RemoveRelationshipAction(component.item, searchResult1.indexableObject, relationship.relationshipType);
+      const action2 = new RemoveRelationshipAction(component.item, searchResult2.indexableObject, relationship.relationshipType);
+
+      expect((component as any).store.dispatch).toHaveBeenCalledWith(action);
+      expect((component as any).store.dispatch).toHaveBeenCalledWith(action2);
+    })
+  });
+});
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
new file mode 100644
index 0000000000..bce1f53c4d
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component.ts
@@ -0,0 +1,261 @@
+import { Component, NgZone, OnDestroy, OnInit } from '@angular/core';
+import { combineLatest, Observable, Subscription, zip as observableZip } from 'rxjs';
+import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { hasValue } 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/search-result.model';
+import { Item } from '../../../../../core/shared/item.model';
+import {
+  getAllSucceededRemoteData,
+  getRemoteDataPayload,
+  getSucceededRemoteData
+} from '../../../../../core/shared/operators';
+import { AddRelationshipAction, RemoveRelationshipAction, UpdateRelationshipAction } from './relationship.actions';
+import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+import { Store } from '@ngrx/store';
+import { AppState } from '../../../../../app.reducer';
+import { Context } from '../../../../../core/shared/context.model';
+import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { LookupRelationService } from '../../../../../core/data/lookup-relation.service';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { ExternalSource } from '../../../../../core/shared/external-source.model';
+import { ExternalSourceService } from '../../../../../core/data/external-source.service';
+
+@Component({
+  selector: 'ds-dynamic-lookup-relation-modal',
+  styleUrls: ['./dynamic-lookup-relation-modal.component.scss'],
+  templateUrl: './dynamic-lookup-relation-modal.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ]
+})
+
+/**
+ * Represents a modal where the submitter can select items to be added as a certain relationship type to the object being submitted
+ */
+export class DsDynamicLookupRelationModalComponent implements OnInit, OnDestroy {
+  /**
+   * The label to use to display i18n messages (describing the type of relationship)
+   */
+  label: string;
+
+  /**
+   * Options for searching related items
+   */
+  relationshipOptions: RelationshipOptions;
+
+  /**
+   * The ID of the list to add/remove selected items to/from
+   */
+  listId: string;
+
+  /**
+   * The item we're adding relationships to
+   */
+  item;
+
+  /**
+   * Is the selection repeatable?
+   */
+  repeatable: boolean;
+
+  /**
+   * The list of selected items
+   */
+  selection$: Observable<ListableObject[]>;
+
+  /**
+   * The context to display lists
+   */
+  context: Context;
+
+  /**
+   * The metadata-fields describing these relationships
+   */
+  metadataFields: string;
+
+  /**
+   * A map of subscriptions within this component
+   */
+  subMap: {
+    [uuid: string]: Subscription
+  } = {};
+
+  /**
+   * A list of the available external sources configured for this relationship
+   */
+  externalSourcesRD$: Observable<RemoteData<PaginatedList<ExternalSource>>>;
+
+  /**
+   * The total amount of internal items for the current options
+   */
+  totalInternal$: Observable<number>;
+
+  /**
+   * The total amount of results for each external source using the current options
+   */
+  totalExternal$: Observable<number[]>;
+
+  constructor(
+    public modal: NgbActiveModal,
+    private selectableListService: SelectableListService,
+    private relationshipService: RelationshipService,
+    private relationshipTypeService: RelationshipTypeService,
+    private externalSourceService: ExternalSourceService,
+    private lookupRelationService: LookupRelationService,
+    private searchConfigService: SearchConfigurationService,
+    private zone: NgZone,
+    private store: Store<AppState>
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.selection$ = this.selectableListService
+      .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))
+    );
+    if (this.relationshipOptions.nameVariants) {
+      this.context = Context.SubmissionModal;
+    }
+
+    this.externalSourcesRD$ = this.externalSourceService.findAll();
+
+    this.setTotals();
+  }
+
+  close() {
+    this.modal.close();
+  }
+
+  /**
+   * Select (a list of) objects and add them to the store
+   * @param selectableObjects
+   */
+  select(...selectableObjects: Array<SearchResult<Item>>) {
+    this.zone.runOutsideAngular(
+      () => {
+        const obs: Observable<any[]> = combineLatest(...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
+                  }
+                })
+              )
+          })
+        );
+        obs
+          .subscribe((arr: any[]) => {
+            return arr.forEach((object: any) => {
+                this.store.dispatch(new AddRelationshipAction(this.item, object.item, this.relationshipOptions.relationshipType, object.nameVariant));
+              }
+            );
+          })
+      });
+  }
+
+  /**
+   * Add a subscription updating relationships with name variants
+   * @param sri The search result to track name variants for
+   */
+  private addNameVariantSubscription(sri: SearchResult<Item>) {
+    const nameVariant$ = this.relationshipService.getNameVariant(this.listId, sri.indexableObject.uuid);
+    this.subMap[sri.indexableObject.uuid] = nameVariant$.pipe(
+      skip(1),
+    ).subscribe((nameVariant: string) => this.store.dispatch(new UpdateRelationshipAction(this.item, sri.indexableObject, this.relationshipOptions.relationshipType, nameVariant)))
+  }
+
+  /**
+   * Deselect (a list of) objects and remove them from the store
+   * @param selectableObjects
+   */
+  deselect(...selectableObjects: Array<SearchResult<Item>>) {
+    this.zone.runOutsideAngular(
+      () => selectableObjects.forEach((object) => {
+        this.subMap[object.indexableObject.uuid].unsubscribe();
+        this.store.dispatch(new RemoveRelationshipAction(this.item, object.indexableObject, this.relationshipOptions.relationshipType));
+      })
+    );
+  }
+
+  /**
+   * Set existing name variants for items by the item's virtual metadata
+   */
+  private setExistingNameVariants() {
+    const virtualMDs: MetadataValue[] = this.item.allMetadata(this.metadataFields).filter((mdValue) => mdValue.isVirtual);
+
+    const relatedItemPairs$: Observable<Array<[Item, Item]>> =
+      combineLatest(virtualMDs.map((md: MetadataValue) => this.relationshipService.findById(md.virtualValue).pipe(getSucceededRemoteData(), getRemoteDataPayload())))
+        .pipe(
+          switchMap((relationships: Relationship[]) => combineLatest(relationships.map((relationship: Relationship) =>
+              combineLatest(
+                relationship.leftItem.pipe(getSucceededRemoteData(), getRemoteDataPayload()),
+                relationship.rightItem.pipe(getSucceededRemoteData(), getRemoteDataPayload())
+              ))
+            )
+          )
+        );
+
+    const relatedItems$: Observable<Item[]> = relatedItemPairs$.pipe(
+      map((relatedItemPairs: Array<[Item, Item]>) => {
+        return relatedItemPairs
+          .map(([left, right]: [Item, Item]) => left.uuid === this.item.uuid ? left : right)
+      })
+    );
+
+    relatedItems$.pipe(take(1)).subscribe((relatedItems) => {
+        let index = 0;
+        virtualMDs.forEach(
+          (md: MetadataValue) => {
+            this.relationshipService.setNameVariant(this.listId, relatedItems[index].uuid, md.value);
+            index++;
+          }
+        );
+      }
+    )
+  }
+
+  /**
+   * Calculate and set the total entries available for each tab
+   */
+  setTotals() {
+    this.totalInternal$ = this.searchConfigService.paginatedSearchOptions.pipe(
+      switchMap((options) => this.lookupRelationService.getTotalLocalResults(this.relationshipOptions, options))
+    );
+
+    const externalSourcesAndOptions$ = combineLatest(
+      this.externalSourcesRD$.pipe(
+        getAllSucceededRemoteData(),
+        getRemoteDataPayload()
+      ),
+      this.searchConfigService.paginatedSearchOptions
+    );
+
+    this.totalExternal$ = externalSourcesAndOptions$.pipe(
+      switchMap(([sources, options]) =>
+        observableZip(...sources.page.map((source: ExternalSource) => this.lookupRelationService.getTotalExternalResults(source, options))))
+    );
+  }
+
+  ngOnDestroy() {
+    Object.values(this.subMap).forEach((subscription) => subscription.unsubscribe());
+  }
+}
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
new file mode 100644
index 0000000000..9536d0a5cb
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.html
@@ -0,0 +1,31 @@
+<div class="row">
+  <div class="col-4">
+    <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.settings' | translate}}</h3>
+    <ds-page-size-selector></ds-page-size-selector>
+  </div>
+  <div class="col-8">
+    <ds-search-form [query]="(searchConfigService.paginatedSearchOptions | async)?.query" [inPlaceSearch]="true"></ds-search-form>
+    <div>
+      <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + externalSource.id | translate}}</h3>
+      <ng-container *ngVar="(entriesRD$ | async) as entriesRD">
+        <ds-viewable-collection *ngIf="entriesRD?.hasSucceeded && !entriesRD?.isLoading && entriesRD?.payload?.page?.length > 0" @fadeIn
+                                [objects]="entriesRD"
+                                [selectable]="true"
+                                [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+                                [config]="initialPagination"
+                                [hideGear]="true"
+                                [context]="context"
+                                (deselectObject)="deselectObject.emit($event)"
+                                (selectObject)="selectObject.emit($event)">
+        </ds-viewable-collection>
+        <ds-loading *ngIf="!entriesRD || !entriesRD?.payload || entriesRD?.isLoading"
+                    message="{{'loading.search-results' | translate}}"></ds-loading>
+        <ds-error   *ngIf="entriesRD?.hasFailed && (!entriesRD?.error || entriesRD?.error?.statusCode != 400)"
+                    message="{{'error.search-results' | translate}}"></ds-error>
+        <div *ngIf="entriesRD?.payload?.page?.length == 0 || entriesRD?.error?.statusCode == 400" id="empty-external-entry-list">
+          {{ 'search.results.empty' | translate }}
+        </div>
+      </ng-container>
+    </div>
+  </div>
+</div>
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.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.scss
new file mode 100644
index 0000000000..e69de29bb2
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
new file mode 100644
index 0000000000..62327e236e
--- /dev/null
+++ 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
@@ -0,0 +1,162 @@
+import { DsDynamicLookupRelationExternalSourceTabComponent } from './dynamic-lookup-relation-external-source-tab.component';
+import { async, ComponentFixture, TestBed } 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 { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { of as observableOf } from 'rxjs/internal/observable/of';
+import {
+  createFailedRemoteDataObject$,
+  createPaginatedList,
+  createPendingRemoteDataObject$,
+  createSuccessfulRemoteDataObject$
+} from '../../../../../testing/utils';
+import { ExternalSourceService } from '../../../../../../core/data/external-source.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';
+
+describe('DsDynamicLookupRelationExternalSourceTabComponent', () => {
+  let component: DsDynamicLookupRelationExternalSourceTabComponent;
+  let fixture: ComponentFixture<DsDynamicLookupRelationExternalSourceTabComponent>;
+  let pSearchOptions;
+  let externalSourceService;
+
+  const externalSource = {
+    id: 'orcidV2',
+    name: 'orcidV2',
+    hierarchical: false
+  } as ExternalSource;
+  const externalEntries = [
+    Object.assign({
+      id: '0001-0001-0001-0001',
+      display: 'John Doe',
+      value: 'John, Doe',
+      metadata: {
+        'dc.identifier.uri': [
+          {
+            value: 'https://orcid.org/0001-0001-0001-0001'
+          }
+        ]
+      }
+    }),
+    Object.assign({
+      id: '0001-0001-0001-0002',
+      display: 'Sampson Megan',
+      value: 'Sampson, Megan',
+      metadata: {
+        'dc.identifier.uri': [
+          {
+            value: 'https://orcid.org/0001-0001-0001-0002'
+          }
+        ]
+      }
+    }),
+    Object.assign({
+      id: '0001-0001-0001-0003',
+      display: 'Edwards Anna',
+      value: 'Edwards, Anna',
+      metadata: {
+        'dc.identifier.uri': [
+          {
+            value: 'https://orcid.org/0001-0001-0001-0003'
+          }
+        ]
+      }
+    })
+  ] as ExternalSourceEntry[];
+
+  function init() {
+    pSearchOptions = new PaginatedSearchOptions({
+      query: 'test'
+    });
+    externalSourceService = jasmine.createSpyObj('externalSourceService', {
+      getExternalSourceEntries: createSuccessfulRemoteDataObject$(createPaginatedList(externalEntries))
+    });
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [DsDynamicLookupRelationExternalSourceTabComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), BrowserAnimationsModule],
+      providers: [
+        {
+          provide: SearchConfigurationService, useValue: {
+            paginatedSearchOptions: observableOf(pSearchOptions)
+          }
+        },
+        { provide: ExternalSourceService, useValue: externalSourceService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsDynamicLookupRelationExternalSourceTabComponent);
+    component = fixture.componentInstance;
+    component.externalSource = externalSource;
+    fixture.detectChanges();
+  });
+
+  describe('when the external entries finished loading successfully', () => {
+    it('should display a ds-viewable-collection component', () => {
+      const collection = fixture.debugElement.query(By.css('ds-viewable-collection'));
+      expect(collection).toBeDefined();
+    });
+  });
+
+  describe('when the external entries are loading', () => {
+    beforeEach(() => {
+      component.entriesRD$ = createPendingRemoteDataObject$(undefined);
+      fixture.detectChanges();
+    });
+
+    it('should not display a ds-viewable-collection component', () => {
+      const collection = fixture.debugElement.query(By.css('ds-viewable-collection'));
+      expect(collection).toBeNull();
+    });
+
+    it('should display a ds-loading component', () => {
+      const loading = fixture.debugElement.query(By.css('ds-loading'));
+      expect(loading).not.toBeNull();
+    });
+  });
+
+  describe('when the external entries failed loading', () => {
+    beforeEach(() => {
+      component.entriesRD$ = createFailedRemoteDataObject$(undefined);
+      fixture.detectChanges();
+    });
+
+    it('should not display a ds-viewable-collection component', () => {
+      const collection = fixture.debugElement.query(By.css('ds-viewable-collection'));
+      expect(collection).toBeNull();
+    });
+
+    it('should display a ds-error component', () => {
+      const error = fixture.debugElement.query(By.css('ds-error'));
+      expect(error).not.toBeNull();
+    });
+  });
+
+  describe('when the external entries return an empty list', () => {
+    beforeEach(() => {
+      component.entriesRD$ = createSuccessfulRemoteDataObject$(createPaginatedList([]));
+      fixture.detectChanges();
+    });
+
+    it('should not display a ds-viewable-collection component', () => {
+      const collection = fixture.debugElement.query(By.css('ds-viewable-collection'));
+      expect(collection).toBeNull();
+    });
+
+    it('should display a message the list is empty', () => {
+      const empty = fixture.debugElement.query(By.css('#empty-external-entry-list'));
+      expect(empty).not.toBeNull();
+    });
+  });
+});
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
new file mode 100644
index 0000000000..d1fa538de3
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component.ts
@@ -0,0 +1,96 @@
+import { Component, EventEmitter, Input, 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 { Router } from '@angular/router';
+import { ExternalSourceService } from '../../../../../../core/data/external-source.service';
+import { Observable } from 'rxjs/internal/Observable';
+import { RemoteData } from '../../../../../../core/data/remote-data';
+import { PaginatedList } from '../../../../../../core/data/paginated-list';
+import { ExternalSourceEntry } from '../../../../../../core/shared/external-source-entry.model';
+import { ExternalSource } from '../../../../../../core/shared/external-source.model';
+import { startWith, switchMap } from 'rxjs/operators';
+import { PaginatedSearchOptions } from '../../../../../search/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';
+
+@Component({
+  selector: 'ds-dynamic-lookup-relation-external-source-tab',
+  styleUrls: ['./dynamic-lookup-relation-external-source-tab.component.scss'],
+  templateUrl: './dynamic-lookup-relation-external-source-tab.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ],
+  animations: [
+    fadeIn,
+    fadeInOut
+  ]
+})
+/**
+ * The tab displaying a list of importable entries for an external source
+ */
+export class DsDynamicLookupRelationExternalSourceTabComponent implements OnInit {
+  /**
+   * The label to use to display i18n messages (describing the type of relationship)
+   */
+  @Input() label: string;
+
+  /**
+   * The ID of the list to add/remove selected items to/from
+   */
+  @Input() listId: string;
+
+  /**
+   * Is the selection repeatable?
+   */
+  @Input() repeatable: boolean;
+
+  /**
+   * The context to display lists
+   */
+  @Input() context: Context;
+
+  /**
+   * Send an event to deselect an object from the list
+   */
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  /**
+   * Send an event to select an object from the list
+   */
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  /**
+   * The initial pagination to start with
+   */
+  initialPagination = Object.assign(new PaginationComponentOptions(), {
+    id: 'submission-external-source-relation-list',
+    pageSize: 5
+  });
+
+  /**
+   * The external source we're selecting entries for
+   */
+  @Input() externalSource: ExternalSource;
+
+  /**
+   * The displayed list of entries
+   */
+  entriesRD$: Observable<RemoteData<PaginatedList<ExternalSourceEntry>>>;
+
+  constructor(private router: Router,
+              public searchConfigService: SearchConfigurationService,
+              private externalSourceService: ExternalSourceService) {
+  }
+
+  ngOnInit(): void {
+    this.entriesRD$ = this.searchConfigService.paginatedSearchOptions.pipe(
+      switchMap((searchOptions: PaginatedSearchOptions) =>
+        this.externalSourceService.getExternalSourceEntries(this.externalSource.id, searchOptions).pipe(startWith(undefined)))
+    )
+  }
+}
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
new file mode 100644
index 0000000000..f32836eef1
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.actions.ts
@@ -0,0 +1,62 @@
+/**
+ * The list of NameVariantAction type definitions
+ */
+import { type } from '../../../../ngrx/type';
+import { Action } from '@ngrx/store';
+import { Item } from '../../../../../core/shared/item.model';
+
+export const NameVariantActionTypes = {
+  SET_NAME_VARIANT: type('dspace/name-variant/SET_NAME_VARIANT'),
+  REMOVE_NAME_VARIANT: type('dspace/name-variant/REMOVE_NAME_VARIANT'),
+};
+
+/* tslint:disable:max-classes-per-file */
+/**
+ * Abstract class for actions that happen to name variants
+ */
+export abstract class NameVariantListAction implements Action {
+  type;
+  payload: {
+    listID: string;
+    itemID: string;
+  };
+
+  constructor(listID: string, itemID: string) {
+    this.payload = { listID, itemID };
+  }
+}
+
+/**
+ * Action for setting a new name on an item in a certain list
+ */
+export class SetNameVariantAction extends NameVariantListAction {
+  type = NameVariantActionTypes.SET_NAME_VARIANT;
+  payload: {
+    listID: string;
+    itemID: string;
+    nameVariant: string;
+  };
+
+  constructor(listID: string, itemID: string, nameVariant: string) {
+    super(listID, itemID);
+    this.payload.nameVariant = nameVariant;
+  }
+}
+
+/**
+ * Action for removing a name on an item in a certain list
+ */
+export class RemoveNameVariantAction extends NameVariantListAction {
+  type = NameVariantActionTypes.REMOVE_NAME_VARIANT;
+  constructor(listID: string, itemID: string) {
+    super(listID, itemID);
+  }
+}
+/* tslint:enable:max-classes-per-file */
+
+/**
+ * A type to encompass all RelationshipActions
+ */
+export type NameVariantAction
+  = SetNameVariantAction
+  | RemoveNameVariantAction
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
new file mode 100644
index 0000000000..1ac6cd55d1
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.spec.ts
@@ -0,0 +1,93 @@
+import * as deepFreeze from 'deep-freeze';
+import { NameVariantAction, RemoveNameVariantAction, SetNameVariantAction } from './name-variant.actions';
+import { Action } from '@ngrx/store';
+import { nameVariantReducer } from './name-variant.reducer';
+
+class NullAction implements Action {
+  type = null;
+}
+
+let listID1;
+let listID2;
+let itemID1;
+let itemID2;
+let variantList1Item1;
+let variantList1Item1Update;
+let variantList1Item2;
+
+function init() {
+  listID1 = 'dbfb81de-2930-4de6-ba2e-ea21c8534ee9';
+  listID2 = 'd7f2c48d-e1e2-4996-ab8d-e271cabec78a';
+  itemID1 = 'd1c81d4f-6b05-4844-986b-372d2e39c6aa';
+  itemID2 = 'fe4ca421-d897-417f-9436-9724262d5c69';
+  variantList1Item1 = 'Test Name Variant 1';
+  variantList1Item1Update = 'Test Name Variant 1 Update';
+  variantList1Item2 = 'Test Name Variant 2';
+}
+
+describe('nameVariantReducer', () => {
+  beforeEach(() => {
+    init();
+  });
+
+  it('should return the current state when no valid actions have been made', () => {
+    const state = { [listID1]: { [itemID1]: variantList1Item1 } };
+    const action = new NullAction() as any;
+    const newState = nameVariantReducer(state, action);
+
+    expect(newState).toEqual(state);
+  });
+
+  it('should start with an empty object', () => {
+    const state = Object.create({});
+    const action = new NullAction() as any;
+    const initialState = nameVariantReducer(undefined, action);
+
+    // The search filter starts collapsed
+    expect(initialState).toEqual(state);
+  });
+
+  it('should set add a new name variant in response to the SET_NAME_VARIANT' +
+    ' action with a combination of list and item ID that does not exist yet', () => {
+    const state = {};
+    state[listID1] = { [itemID1]: variantList1Item1 };
+    const action = new SetNameVariantAction(listID1, itemID2, variantList1Item2);
+    const newState = nameVariantReducer(state, action);
+
+    expect(newState[listID1][itemID1]).toEqual(variantList1Item1);
+    expect(newState[listID1][itemID2]).toEqual(variantList1Item2);
+  });
+
+  it('should set a name variant in response to the SET_NAME_VARIANT' +
+    ' action with a combination of list and item ID that already exists', () => {
+    const state = {};
+    state[listID1] = { [itemID1]: variantList1Item1 };
+    const action = new SetNameVariantAction(listID1, itemID1, variantList1Item1Update);
+    const newState = nameVariantReducer(state, action);
+
+    expect(newState[listID1][itemID1]).toEqual(variantList1Item1Update);
+  });
+
+  it('should remove a name variant in response to the REMOVE_NAME_VARIANT' +
+    ' action with a combination of list and item ID that already exists', () => {
+    const state = {};
+    state[listID1] = { [itemID1]: variantList1Item1 };
+    expect(state[listID1][itemID1]).toEqual(variantList1Item1);
+
+    const action = new RemoveNameVariantAction(listID1, itemID1);
+    const newState = nameVariantReducer(state, action);
+
+    expect(newState[listID1][itemID1]).toBeUndefined();
+  });
+
+  it('should do nothing in response to the REMOVE_NAME_VARIANT' +
+    ' action with a combination of list and item ID that does not exists', () => {
+    const state = {};
+    state[listID1] = { [itemID1]: variantList1Item1 };
+
+    const action = new RemoveNameVariantAction(listID2, itemID1);
+    const newState = nameVariantReducer(state, action);
+
+    expect(newState).toEqual(state);
+  });
+});
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
new file mode 100644
index 0000000000..9f93cf2dd1
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/name-variant.reducer.ts
@@ -0,0 +1,50 @@
+/**
+ * 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';
+
+export interface NameVariantListsState {
+  [listID: string]: NameVariantListState;
+}
+
+/**
+ * Represents the state of a single list containing nameVariants in the store
+ */
+export interface NameVariantListState {
+  [itemID: string]: string;
+}
+
+/**
+ * Reducer that handles NameVariantAction to update the NameVariantListsState
+ * @param {NameVariantListsState} state The initial NameVariantListsState
+ * @param {NameVariantAction} action The Action to be performed on the state
+ * @returns {NameVariantListsState} The new, reduced NameVariantListsState
+ */
+export function nameVariantReducer(state: NameVariantListsState = {}, action: NameVariantAction): NameVariantListsState {
+  switch (action.type) {
+    case NameVariantActionTypes.SET_NAME_VARIANT: {
+      const listState: NameVariantListState = state[action.payload.listID] || {};
+      const nameVariant = (action as SetNameVariantAction).payload.nameVariant;
+      const newListState = setNameVariant(listState, action.payload.itemID, nameVariant);
+      return Object.assign({}, state, { [action.payload.listID]: newListState });
+    }
+    case NameVariantActionTypes.REMOVE_NAME_VARIANT: {
+      const listState: NameVariantListState = state[action.payload.listID];
+      if (hasValue(listState) && hasValue(listState[action.payload.itemID])) {
+        const newListState = setNameVariant(listState, action.payload.itemID, undefined);
+        return Object.assign({}, state, { [action.payload.listID]: newListState });
+      } else {
+        return state;
+      }
+    }
+    default: {
+      return state;
+    }
+  }
+}
+
+function setNameVariant(state: NameVariantListState, itemID: string, nameVariant: string) {
+  return Object.assign({}, state, { [itemID]: nameVariant });
+}
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
new file mode 100644
index 0000000000..57375bd380
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.actions.ts
@@ -0,0 +1,108 @@
+/**
+ * The list of RelationshipAction type definitions
+ */
+import { type } from '../../../../ngrx/type';
+import { Action } from '@ngrx/store';
+import { Item } from '../../../../../core/shared/item.model';
+
+export const RelationshipActionTypes = {
+  ADD_RELATIONSHIP: type('dspace/relationship/ADD_RELATIONSHIP'),
+  REMOVE_RELATIONSHIP: type('dspace/relationship/REMOVE_RELATIONSHIP'),
+  UPDATE_RELATIONSHIP: type('dspace/relationship/UPDATE_RELATIONSHIP'),
+};
+
+/* tslint:disable:max-classes-per-file */
+/**
+ * An ngrx action to create a new relationship
+ */
+export class AddRelationshipAction implements Action {
+  type = RelationshipActionTypes.ADD_RELATIONSHIP;
+
+  payload: {
+    item1: Item;
+    item2: Item;
+    relationshipType: string;
+    nameVariant: string;
+  };
+
+  /**
+   * Create a new AddRelationshipAction
+   *
+   * @param item1 The first item in the relationship
+   * @param item2 The second item in the relationship
+   * @param relationshipType The label of the relationshipType
+   * @param nameVariant The nameVariant of the relationshipType
+   */
+  constructor(
+    item1: Item,
+    item2: Item,
+    relationshipType: string,
+    nameVariant?: string
+  ) {
+    this.payload = { item1, item2, relationshipType, nameVariant };
+  }
+}
+
+export class UpdateRelationshipAction implements Action {
+  type = RelationshipActionTypes.UPDATE_RELATIONSHIP;
+
+  payload: {
+    item1: Item;
+    item2: Item;
+    relationshipType: string;
+    nameVariant: string;
+  };
+
+  /**
+   * Create a new UpdateRelationshipAction
+   *
+   * @param item1 The first item in the relationship
+   * @param item2 The second item in the relationship
+   * @param relationshipType The label of the relationshipType
+   * @param nameVariant The nameVariant of the relationshipType
+   */
+  constructor(
+    item1: Item,
+    item2: Item,
+    relationshipType: string,
+    nameVariant?: string
+  ) {
+    this.payload = { item1, item2, relationshipType, nameVariant };
+  }
+}
+
+/**
+ * An ngrx action to remove an existing relationship
+ */
+export class RemoveRelationshipAction implements Action {
+  type = RelationshipActionTypes.REMOVE_RELATIONSHIP;
+
+  payload: {
+    item1: Item;
+    item2: Item;
+    relationshipType: string;
+  };
+
+  /**
+   * Create a new RemoveRelationshipAction
+   *
+   * @param item1 The first item in the relationship
+   * @param item2 The second item in the relationship
+   * @param relationshipType The label of the relationshipType
+   */
+  constructor(
+    item1: Item,
+    item2: Item,
+    relationshipType: string) {
+    this.payload = { item1, item2, relationshipType };
+  }
+}
+
+/* tslint:enable:max-classes-per-file */
+
+/**
+ * A type to encompass all RelationshipActions
+ */
+export type RelationshipAction
+  = AddRelationshipAction
+  | RemoveRelationshipAction
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
new file mode 100644
index 0000000000..f9d7dabf9c
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.spec.ts
@@ -0,0 +1,256 @@
+import { BehaviorSubject, Observable, of as observableOf } from 'rxjs';
+import { RelationshipEffects } from './relationship.effects';
+import { async, TestBed } from '@angular/core/testing';
+import { provideMockActions } from '@ngrx/effects/testing';
+import { AddRelationshipAction, RelationshipActionTypes, RemoveRelationshipAction } from './relationship.actions';
+import { Item } from '../../../../../core/shared/item.model';
+import { MetadataValue } from '../../../../../core/shared/metadata.models';
+import { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { Relationship } from '../../../../../core/shared/item-relationships/relationship.model';
+import { createSuccessfulRemoteDataObject$, spyOnOperator } from '../../../../testing/utils';
+import { RelationshipType } from '../../../../../core/shared/item-relationships/relationship-type.model';
+import { cold, hot } from 'jasmine-marbles';
+import * as operators from 'rxjs/operators';
+import { last } from 'rxjs/operators';
+import { ItemType } from '../../../../../core/shared/item-relationships/item-type.model';
+import { RestResponse } from '../../../../../core/cache/response.models';
+
+describe('RelationshipEffects', () => {
+  let relationEffects: RelationshipEffects;
+  let actions: Observable<any>;
+
+  let testUUID1;
+  let testUUID2;
+  let leftTypeString;
+  let rightTypeString;
+  let leftType;
+  let rightType;
+  let leftTypeMD;
+  let rightTypeMD;
+  let relationshipID;
+  let identifier;
+
+  let leftItem;
+
+  let rightItem;
+
+  let relationshipType: RelationshipType;
+
+  let relationship;
+  let mockRelationshipService;
+  let mockRelationshipTypeService;
+
+  function init() {
+    testUUID1 = '20e24c2f-a00a-467c-bdee-c929e79bf08d';
+    testUUID2 = '7f66a4d0-8557-4e77-8b1e-19930895f10a';
+    leftTypeString = 'Publication';
+    rightTypeString = 'Person';
+    leftType = Object.assign(new ItemType(), {label: leftTypeString});
+    rightType = Object.assign(new ItemType(), {label: rightTypeString});
+    leftTypeMD = Object.assign(new MetadataValue(), { value: leftTypeString });
+    rightTypeMD = Object.assign(new MetadataValue(), { value: rightTypeString });
+    relationshipID = '1234';
+
+    leftItem = Object.assign(new Item(), {
+      uuid: testUUID1,
+      metadata: { 'relationship.type': [leftTypeMD] }
+    });
+
+    rightItem = Object.assign(new Item(), {
+      uuid: testUUID2,
+      metadata: { 'relationship.type': [rightTypeMD] }
+    });
+
+    relationshipType = Object.assign(new RelationshipType(), {
+      leftwardType: 'isAuthorOfPublication',
+      rightwardType: 'isPublicationOfAuthor',
+      leftType: createSuccessfulRemoteDataObject$(leftType),
+      rightType: createSuccessfulRemoteDataObject$(rightType)
+    });
+
+    relationship = Object.assign(new Relationship(),
+      {
+        uuid: relationshipID,
+        id: relationshipID,
+        leftItem: createSuccessfulRemoteDataObject$(leftItem),
+        rightItem: createSuccessfulRemoteDataObject$(rightItem),
+        relationshipType: createSuccessfulRemoteDataObject$(relationshipType)
+      });
+
+    mockRelationshipService = {
+      getRelationshipByItemsAndLabel:
+        () => observableOf(relationship),
+      deleteRelationship: () => observableOf(new RestResponse(true, 200, 'OK')),
+      addRelationship: () => observableOf(new RestResponse(true, 200, 'OK'))
+
+    };
+    mockRelationshipTypeService = {
+      getRelationshipTypeByLabelAndTypes:
+        () => observableOf(relationshipType)
+    };
+  }
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      providers: [
+        RelationshipEffects,
+        provideMockActions(() => actions),
+        { provide: RelationshipTypeService, useValue: mockRelationshipTypeService },
+        { provide: RelationshipService, useValue: mockRelationshipService }
+      ],
+    });
+  }));
+
+  beforeEach(() => {
+    relationEffects = TestBed.get(RelationshipEffects);
+    identifier = (relationEffects as any).createIdentifier(leftItem, rightItem, relationshipType.leftwardType);
+  });
+
+  describe('mapLastActions$', () => {
+    describe('When an ADD_RELATIONSHIP action is triggered', () => {
+      describe('When it\'s the first time for this identifier', () => {
+        let action;
+        it('should set the current value debounceMap and the value of the initialActionMap to ADD_RELATIONSHIP', () => {
+          action = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
+          actions = hot('--a-', { a: action });
+          const expected = cold('--b-', { b: undefined });
+          expect(relationEffects.mapLastActions$).toBeObservable(expected);
+
+          expect((relationEffects as any).initialActionMap[identifier]).toBe(action.type);
+          expect((relationEffects as any).debounceMap[identifier].value).toBe(action.type);
+        });
+      });
+
+      describe('When it\'s not the first time for this identifier', () => {
+        let action;
+        const testActionType = 'TEST_TYPE';
+        beforeEach(() => {
+          (relationEffects as any).initialActionMap[identifier] = testActionType;
+          (relationEffects as any).debounceMap[identifier] = new BehaviorSubject<string>(testActionType);
+        });
+
+        it('should set the current value debounceMap to ADD_RELATIONSHIP but not change the value of the initialActionMap', () => {
+          action = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
+          actions = hot('--a-', { a: action });
+          const expected = cold('--b-', { b: undefined });
+          expect(relationEffects.mapLastActions$).toBeObservable(expected);
+
+          expect((relationEffects as any).initialActionMap[identifier]).toBe(testActionType);
+          expect((relationEffects as any).debounceMap[identifier].value).toBe(action.type);
+        });
+      });
+
+      describe('When the initialActionMap contains an ADD_RELATIONSHIP action', () => {
+        let action;
+        describe('When the last value in the debounceMap is also an ADD_RELATIONSHIP action', () => {
+          beforeEach(() => {
+            (relationEffects as any).initialActionMap[identifier] = RelationshipActionTypes.ADD_RELATIONSHIP;
+            spyOnOperator(operators, 'debounceTime').and.returnValue((v) => v);
+            spyOn((relationEffects as any), 'addRelationship');
+          });
+          it('should call addRelationship on the effect', () => {
+            action = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
+            actions = hot('--a-', { a: action });
+            const expected = cold('--b-', { b: undefined });
+            expect(relationEffects.mapLastActions$).toBeObservable(expected);
+            expect((relationEffects as any).addRelationship).toHaveBeenCalledWith(leftItem, rightItem, relationshipType.leftwardType, undefined)
+          });
+        });
+
+        describe('When the last value in the debounceMap is instead a REMOVE_RELATIONSHIP action', () => {
+          beforeEach(() => {
+            /**
+             * Change debounceTime to last so there's no need to fire a certain amount of actions in the debounce time frame
+             */
+            spyOnOperator(operators, 'debounceTime').and.returnValue((v) => v.pipe(last()));
+            spyOn((relationEffects as any), 'addRelationship');
+            spyOn((relationEffects as any), 'removeRelationship');
+          });
+          it('should <b>not</b> call removeRelationship or addRelationship on the effect', () => {
+            const actiona = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
+            const actionb = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
+            actions = hot('--ab-', { a: actiona, b: actionb });
+            const expected = cold('--bb-', { b: undefined });
+            expect(relationEffects.mapLastActions$).toBeObservable(expected);
+            expect((relationEffects as any).addRelationship).not.toHaveBeenCalled();
+            expect((relationEffects as any).removeRelationship).not.toHaveBeenCalled();
+          });
+        });
+      });
+    });
+
+    describe('When an REMOVE_RELATIONSHIP action is triggered', () => {
+      describe('When it\'s the first time for this identifier', () => {
+        let action;
+        it('should set the current value debounceMap and the value of the initialActionMap to REMOVE_RELATIONSHIP', () => {
+          action = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
+          actions = hot('--a-', { a: action });
+          const expected = cold('--b-', { b: undefined });
+          expect(relationEffects.mapLastActions$).toBeObservable(expected);
+
+          expect((relationEffects as any).initialActionMap[identifier]).toBe(action.type);
+          expect((relationEffects as any).debounceMap[identifier].value).toBe(action.type);
+        });
+      });
+
+      describe('When it\'s not the first time for this identifier', () => {
+        let action;
+        const testActionType = 'TEST_TYPE';
+        beforeEach(() => {
+          (relationEffects as any).initialActionMap[identifier] = testActionType;
+          (relationEffects as any).debounceMap[identifier] = new BehaviorSubject<string>(testActionType);
+        });
+
+        it('should set the current value debounceMap to REMOVE_RELATIONSHIP but not change the value of the initialActionMap', () => {
+          action = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
+          actions = hot('--a-', { a: action });
+          const expected = cold('--b-', { b: undefined });
+          expect(relationEffects.mapLastActions$).toBeObservable(expected);
+
+          expect((relationEffects as any).initialActionMap[identifier]).toBe(testActionType);
+          expect((relationEffects as any).debounceMap[identifier].value).toBe(action.type);
+        });
+      });
+
+      describe('When the initialActionMap contains an REMOVE_RELATIONSHIP action', () => {
+        let action;
+        describe('When the last value in the debounceMap is also an REMOVE_RELATIONSHIP action', () => {
+          beforeEach(() => {
+            (relationEffects as any).initialActionMap[identifier] = RelationshipActionTypes.REMOVE_RELATIONSHIP;
+            spyOnOperator(operators, 'debounceTime').and.returnValue((v) => v);
+            spyOn((relationEffects as any), 'removeRelationship');
+          });
+
+          it('should call removeRelationship on the effect', () => {
+            action = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
+            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)
+          });
+        });
+
+        describe('When the last value in the debounceMap is instead a ADD_RELATIONSHIP action', () => {
+          beforeEach(() => {
+            /**
+             * Change debounceTime to last so there's no need to fire a certain amount of actions in the debounce time frame
+             */
+            spyOnOperator(operators, 'debounceTime').and.returnValue((v) => v.pipe(last()));
+            spyOn((relationEffects as any), 'addRelationship');
+            spyOn((relationEffects as any), 'removeRelationship');
+          });
+          it('should <b>not</b> call addRelationship or removeRelationship on the effect', () => {
+            const actionb = new RemoveRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
+            const actiona = new AddRelationshipAction(leftItem, rightItem, relationshipType.leftwardType);
+            actions = hot('--ab-', { a: actiona, b: actionb });
+            const expected = cold('--bb-', { b: undefined });
+            expect(relationEffects.mapLastActions$).toBeObservable(expected);
+            expect((relationEffects as any).addRelationship).not.toHaveBeenCalled();
+            expect((relationEffects as any).removeRelationship).not.toHaveBeenCalled();
+          });
+        });
+      });
+    });
+  });
+});
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
new file mode 100644
index 0000000000..e26abf94c1
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/relationship.effects.ts
@@ -0,0 +1,135 @@
+import { Injectable } from '@angular/core';
+import { Actions, Effect, ofType } from '@ngrx/effects';
+import { debounceTime, map, mergeMap, take, tap } from 'rxjs/operators';
+import { BehaviorSubject } from 'rxjs';
+import { RelationshipService } from '../../../../../core/data/relationship.service';
+import { getSucceededRemoteData } from '../../../../../core/shared/operators';
+import { AddRelationshipAction, RelationshipAction, RelationshipActionTypes, RemoveRelationshipAction, UpdateRelationshipAction } 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 { RelationshipTypeService } from '../../../../../core/data/relationship-type.service';
+
+const DEBOUNCE_TIME = 5000;
+
+/**
+ * NGRX effects for RelationshipEffects
+ */
+@Injectable()
+export class RelationshipEffects {
+  /**
+   * Map that keeps track of the latest RelationshipEffects for each relationship's composed identifier
+   */
+  private debounceMap: {
+    [identifier: string]: BehaviorSubject<string>
+  } = {};
+
+  private nameVariantUpdates: {
+    [identifier: string]: string
+  } = {};
+
+  private initialActionMap: {
+    [identifier: string]: string
+  } = {};
+
+  /**
+   * Effect that makes sure all last fired RelationshipActions' types are stored in the map of this service, with the object uuid as their key
+   */
+  @Effect({ dispatch: false }) mapLastActions$ = this.actions$
+    .pipe(
+      ofType(RelationshipActionTypes.ADD_RELATIONSHIP, RelationshipActionTypes.REMOVE_RELATIONSHIP),
+      map((action: RelationshipAction) => {
+          const { item1, item2, 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(
+              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, nameVariant)
+                  } else {
+                    this.removeRelationship(item1, item2, relationshipType);
+                  }
+                }
+                delete this.debounceMap[identifier];
+                delete this.initialActionMap[identifier];
+              }
+            )
+          } else {
+            this.debounceMap[identifier].next(action.type);
+          }
+        }
+      )
+    );
+
+  /**
+   * Updates the namevariant in a relationship
+   * 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
+   */
+  @Effect({ dispatch: false }) updateNameVariantsActions$ = this.actions$
+    .pipe(
+      ofType(RelationshipActionTypes.UPDATE_RELATIONSHIP),
+      map((action: UpdateRelationshipAction) => {
+          const { item1, item2, relationshipType, 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(getSucceededRemoteData())
+              .subscribe();
+          }
+        }
+      )
+    );
+
+  constructor(private actions$: Actions,
+              private relationshipService: RelationshipService,
+              private relationshipTypeService: RelationshipTypeService,
+  ) {
+  }
+
+  private createIdentifier(item1: Item, item2: Item, relationshipType: string): string {
+    return `${item1.uuid}-${item2.uuid}-${relationshipType}`;
+  }
+
+  private addRelationship(item1: Item, item2: Item, relationshipType: string, nameVariant?: string) {
+    const type1: string = item1.firstMetadataValue('relationship.type');
+    const type2: string = item2.firstMetadataValue('relationship.type');
+    return this.relationshipTypeService.getRelationshipTypeByLabelAndTypes(relationshipType, type1, type2)
+      .pipe(
+        mergeMap((type: RelationshipType) => {
+            const isSwitched = type.rightwardType === relationshipType;
+            if (isSwitched) {
+              return this.relationshipService.addRelationship(type.id, item2, item1, nameVariant, undefined);
+            } else {
+              return this.relationshipService.addRelationship(type.id, item1, item2, undefined, nameVariant);
+            }
+          }
+        )
+      ).pipe(take(1))
+      .subscribe();
+  }
+
+  private removeRelationship(item1: Item, item2: Item, relationshipType: string) {
+    this.relationshipService.getRelationshipByItemsAndLabel(item1, item2, relationshipType).pipe(
+      take(1),
+      hasValueOperator(),
+      mergeMap((relationship: Relationship) => this.relationshipService.deleteRelationship(relationship.id)),
+      take(1)
+    ).subscribe();
+  }
+}
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
new file mode 100644
index 0000000000..36197b33c4
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.html
@@ -0,0 +1,69 @@
+<div class="row">
+    <ds-search-sidebar class="col-4" id="search-sidebar"
+                       [resultCount]="(resultsRD$ | async)?.payload?.totalElements"
+                       [inPlaceSearch]="true" [showViewModes]="false"></ds-search-sidebar>
+    <div class="col-8">
+        <ds-search-form [query]="(searchConfigService.paginatedSearchOptions | async)?.query" [inPlaceSearch]="true"></ds-search-form>
+
+        <ds-search-labels [inPlaceSearch]="true"></ds-search-labels>
+
+        <div *ngIf="repeatable" class="position-absolute">
+            <div class="input-group mb-3">
+                <div class="input-group-prepend">
+                    <div class="input-group-text">
+                        <!-- In theory we don't need separate checkboxes for this,
+                        but I wasn't able to get this to work correctly without them.
+                        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)"
+                               type="checkbox"
+                               [indeterminate]="false"
+                               (change)="selectAll()">
+                        <input *ngIf="!allSelected && (someSelected$ | async)"
+                               type="checkbox"
+                               [indeterminate]="true"
+                               (change)="deselectAll()">
+                        <input *ngIf="allSelected" type="checkbox"
+                               [checked]="true"
+                               (change)="deselectAll()">
+                    </div>
+                </div>
+                <div ngbDropdown class="input-group-append">
+                    <button *ngIf="selectAllLoading" type="button"
+                            class="btn btn-outline-secondary rounded-right">
+                            <span class="spinner-border spinner-border-sm" role="status"
+                                  aria-hidden="true"></span>
+                        <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.search-tab.loading' | translate) }}</span>
+                    </button>
+                    <button id="resultdropdown" type="button"
+                            ngbDropdownToggle
+                            class="btn btn-outline-secondary dropdown-toggle-split"
+                            data-toggle="dropdown" aria-haspopup="true"
+                            aria-expanded="false"
+                            [hidden]="selectAllLoading">
+                        <span class="sr-only">{{ ('submission.sections.describe.relationship-lookup.toggle-dropdown' | translate) }}</span>
+                    </button>
+                    <div ngbDropdownMenu aria-labelledby="resultdropdown" *ngVar="(resultsRD$ | async) as resultsRD">
+                        <button class="dropdown-item"
+                                (click)="selectPage(resultsRD?.payload?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.select-page' | translate) }}</button>
+                        <button class="dropdown-item"
+                                (click)="deselectPage(resultsRD?.payload?.page)">{{ ('submission.sections.describe.relationship-lookup.search-tab.deselect-page' | translate) }}</button>
+                        <button class="dropdown-item" (click)="selectAll()">{{ ('submission.sections.describe.relationship-lookup.search-tab.select-all' | translate) }}</button>
+                        <button class="dropdown-item" (click)="deselectAll()">{{ ('submission.sections.describe.relationship-lookup.search-tab.deselect-all' | translate) }}</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <ds-search-results [searchResults]="(resultsRD$ | async)"
+                           [sortConfig]="this.lookupRelationService.searchConfig?.sort"
+                           [searchConfig]="this.lookupRelationService.searchConfig"
+                           [selectable]="true"
+                           [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+                           [linkType]="linkTypes.ExternalLink"
+                           [context]="context"
+                           (deselectObject)="deselectObject.emit($event)"
+                           (selectObject)="selectObject.emit($event)">
+        </ds-search-results>
+    </div>
+</div>
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss
new file mode 100644
index 0000000000..4562a95080
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.scss
@@ -0,0 +1,3 @@
+.position-absolute {
+    right: $spacer;
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..ced6c8b88b
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.spec.ts
@@ -0,0 +1,153 @@
+import { async, ComponentFixture, TestBed } 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 { RouteService } from '../../../../../../core/services/route.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { VarDirective } from '../../../../../utils/var.directive';
+import { RelationshipOptions } from '../../../models/relationship-options.model';
+import { of as observableOf } from 'rxjs';
+import { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../testing/utils';
+import { PaginatedList } from '../../../../../../core/data/paginated-list';
+import { ItemSearchResult } from '../../../../../object-collection/shared/item-search-result.model';
+import { Item } from '../../../../../../core/shared/item.model';
+import { ActivatedRoute } from '@angular/router';
+import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
+
+describe('DsDynamicLookupRelationSearchTabComponent', () => {
+  let component: DsDynamicLookupRelationSearchTabComponent;
+  let fixture: ComponentFixture<DsDynamicLookupRelationSearchTabComponent>;
+  let relationship;
+  let pSearchOptions;
+  let item1;
+  let item2;
+  let item3;
+  let item4;
+  let searchResult1;
+  let searchResult2;
+  let searchResult3;
+  let searchResult4;
+  let listID;
+  let selection$;
+
+  let results;
+  let selectableListService;
+  let lookupRelationService;
+
+  function init() {
+    relationship = { filter: 'filter', relationshipType: 'isAuthorOfPublication', nameVariants: true } as RelationshipOptions;
+    pSearchOptions = new PaginatedSearchOptions({});
+    item1 = Object.assign(new Item(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
+    item2 = Object.assign(new Item(), { uuid: 'c8279647-1acc-41ae-b036-951d5f65649b' });
+    item3 = Object.assign(new Item(), { uuid: 'c3bcbff5-ec0c-4831-8e4c-94b9c933ccac' });
+    item4 = Object.assign(new Item(), { uuid: 'f96a385e-de10-45b2-be66-7f10bf52f765' });
+    searchResult1 = Object.assign(new ItemSearchResult(), { indexableObject: item1 });
+    searchResult2 = Object.assign(new ItemSearchResult(), { indexableObject: item2 });
+    searchResult3 = Object.assign(new ItemSearchResult(), { indexableObject: item3 });
+    searchResult4 = Object.assign(new ItemSearchResult(), { indexableObject: item4 });
+    listID = '6b0c8221-fcb4-47a8-b483-ca32363fffb3';
+    selection$ = observableOf([searchResult1, searchResult2]);
+
+    results = new PaginatedList(undefined, [searchResult1, searchResult2, searchResult3]);
+    selectableListService = jasmine.createSpyObj('selectableListService', ['deselect', 'select', 'deselectAll']);
+    lookupRelationService = jasmine.createSpyObj('lookupRelationService', {
+      getLocalResults: createSuccessfulRemoteDataObject$(results)
+    });
+    lookupRelationService.searchConfig = {};
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [DsDynamicLookupRelationSearchTabComponent, VarDirective],
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      providers: [
+        { provide: SearchService, useValue: { search: () => createSuccessfulRemoteDataObject$(results) } },
+        {
+          provide: SelectableListService, useValue: selectableListService
+        },
+        {
+          provide: SearchConfigurationService, useValue: {
+            paginatedSearchOptions: observableOf(pSearchOptions)
+          }
+        },
+        {
+          provide: RouteService, useValue: {
+            setParameter: () => {
+              // do nothing
+            }
+          }
+        },
+        { provide: ActivatedRoute, useValue: { snapshot: { queryParams: {} } } },
+        { provide: LookupRelationService, useValue: lookupRelationService }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsDynamicLookupRelationSearchTabComponent);
+    component = fixture.componentInstance;
+    component.relationship = relationship;
+    component.selection$ = selection$;
+    component.listId = listID;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  describe('selectPage', () => {
+    beforeEach(() => {
+      spyOn(component.selectObject, 'emit');
+      component.selectPage([searchResult1, searchResult2, searchResult4]);
+    });
+
+    it('should emit the page filtered from already selected objects and call select on the service for all objects', () => {
+      expect(component.selectObject.emit).toHaveBeenCalledWith(searchResult4);
+      expect(selectableListService.select).toHaveBeenCalledWith(listID, [searchResult1, searchResult2, searchResult4]);
+    });
+  });
+
+  describe('deselectPage', () => {
+    beforeEach(() => {
+      spyOn(component.deselectObject, 'emit');
+      component.deselectPage([searchResult1, searchResult2, searchResult3]);
+    });
+
+    it('should emit the page filtered from not yet selected objects and call select on the service for all objects', () => {
+      expect((component.deselectObject as any).emit).toHaveBeenCalledWith(searchResult1, searchResult2);
+      expect(selectableListService.deselect).toHaveBeenCalledWith(listID, [searchResult1, searchResult2, searchResult3]);
+    });
+  });
+
+  describe('selectAll', () => {
+    beforeEach(() => {
+      spyOn(component.selectObject, 'emit');
+      component.selectAll();
+    });
+
+    it('should emit the page filtered from already selected objects and call select on the service for all objects', () => {
+      expect(component.selectObject.emit).toHaveBeenCalledWith(searchResult3);
+      expect(selectableListService.select).toHaveBeenCalledWith(listID, [searchResult1, searchResult2, searchResult3]);
+    });
+  });
+
+  describe('deselectAll', () => {
+    beforeEach(() => {
+      spyOn(component.deselectObject, 'emit');
+      component.deselectAll();
+    });
+
+    it('should emit the page filtered from not yet selected objects and call select on the service for all objects', () => {
+      expect((component.deselectObject as any).emit).toHaveBeenCalledWith(searchResult1, searchResult2);
+      expect(selectableListService.deselectAll).toHaveBeenCalledWith(listID);
+    });
+  });
+});
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
new file mode 100644
index 0000000000..9484631610
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component.ts
@@ -0,0 +1,221 @@
+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 { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model';
+import { SearchResult } from '../../../../../search/search-result.model';
+import { PaginatedList } from '../../../../../../core/data/paginated-list';
+import { RemoteData } from '../../../../../../core/data/remote-data';
+import { Observable, ReplaySubject } 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 { ActivatedRoute, Router } from '@angular/router';
+import { SelectableListService } from '../../../../../object-list/selectable-list/selectable-list.service';
+import { hasValue, isNotEmpty } from '../../../../../empty.util';
+import { concat, map, multicast, switchMap, take, takeWhile, tap } from 'rxjs/operators';
+import { DSpaceObject } from '../../../../../../core/shared/dspace-object.model';
+import { getSucceededRemoteData } from '../../../../../../core/shared/operators';
+import { RouteService } from '../../../../../../core/services/route.service';
+import { CollectionElementLinkType } from '../../../../../object-collection/collection-element-link.type';
+import { Context } from '../../../../../../core/shared/context.model';
+import { LookupRelationService } from '../../../../../../core/data/lookup-relation.service';
+
+@Component({
+  selector: 'ds-dynamic-lookup-relation-search-tab',
+  styleUrls: ['./dynamic-lookup-relation-search-tab.component.scss'],
+  templateUrl: './dynamic-lookup-relation-search-tab.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ]
+})
+
+/**
+ * Tab for inside the lookup model that represents the items that can be used as a relationship in this submission
+ */
+export class DsDynamicLookupRelationSearchTabComponent implements OnInit, OnDestroy {
+  /**
+   * Options for searching related items
+   */
+  @Input() relationship: RelationshipOptions;
+
+  /**
+   * The ID of the list to add/remove selected items to/from
+   */
+  @Input() listId: string;
+
+  /**
+   * Is the selection repeatable?
+   */
+  @Input() repeatable: boolean;
+
+  /**
+   * The list of selected items
+   */
+  @Input() selection$: Observable<ListableObject[]>;
+
+  /**
+   * The context to display lists
+   */
+  @Input() context: Context;
+
+  /**
+   * Send an event to deselect an object from the list
+   */
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  /**
+   * Send an event to select an object from the list
+   */
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  /**
+   * Search results
+   */
+  resultsRD$: Observable<RemoteData<PaginatedList<SearchResult<Item>>>>;
+
+  /**
+   * Are all results selected?
+   */
+  allSelected: boolean;
+
+  /**
+   * Are some results selected?
+   */
+  someSelected$: Observable<boolean>;
+
+  /**
+   * Is it currently loading to select all results?
+   */
+  selectAllLoading: boolean;
+
+  /**
+   * Subscription to unsubscribe from
+   */
+  subscription;
+
+  /**
+   * The initial pagination to use
+   */
+  initialPagination = Object.assign(new PaginationComponentOptions(), {
+    id: 'submission-relation-list',
+    pageSize: 5
+  });
+
+  /**
+   * The type of links to display
+   */
+  linkTypes = CollectionElementLinkType;
+
+  constructor(
+    private searchService: SearchService,
+    private router: Router,
+    private route: ActivatedRoute,
+    private selectableListService: SelectableListService,
+    public searchConfigService: SearchConfigurationService,
+    private routeService: RouteService,
+    public lookupRelationService: LookupRelationService
+  ) {
+  }
+
+  /**
+   * Sets up the pagination and fixed query parameters
+   */
+  ngOnInit(): void {
+    this.resetRoute();
+    this.routeService.setParameter('fixedFilterQuery', this.relationship.filter);
+    this.routeService.setParameter('configuration', this.relationship.searchConfiguration);
+
+    this.someSelected$ = this.selection$.pipe(map((selection) => isNotEmpty(selection)));
+    this.resultsRD$ = this.searchConfigService.paginatedSearchOptions.pipe(
+      switchMap((options) => this.lookupRelationService.getLocalResults(this.relationship, options))
+    );
+  }
+
+  /**
+   * Method to reset the route when the window is opened to make sure no strange pagination issues appears
+   */
+  resetRoute() {
+    this.router.navigate([], {
+      queryParams: Object.assign({}, { pageSize: this.initialPagination.pageSize }, this.route.snapshot.queryParams, { page: 1 })
+    });
+  }
+
+  /**
+   * Selects a page in the store
+   * @param page The page to select
+   */
+  selectPage(page: Array<SearchResult<Item>>) {
+    this.selection$
+      .pipe(take(1))
+      .subscribe((selection: Array<SearchResult<Item>>) => {
+        const filteredPage = page.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
+        this.selectObject.emit(...filteredPage);
+      });
+    this.selectableListService.select(this.listId, page);
+  }
+
+  /**
+   * Deselects a page in the store
+   * @param page the page to deselect
+   */
+  deselectPage(page: Array<SearchResult<Item>>) {
+    this.allSelected = false;
+    this.selection$
+      .pipe(take(1))
+      .subscribe((selection: Array<SearchResult<Item>>) => {
+        const filteredPage = page.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) >= 0);
+        this.deselectObject.emit(...filteredPage);
+      });
+    this.selectableListService.deselect(this.listId, page);
+  }
+
+  /**
+   * Select all items that were found using the current search query
+   */
+  selectAll() {
+    this.allSelected = true;
+    this.selectAllLoading = true;
+    const fullPagination = Object.assign(new PaginationComponentOptions(), {
+      currentPage: 1,
+      pageSize: 9999
+    });
+    const fullSearchConfig = Object.assign(this.lookupRelationService.searchConfig, { pagination: fullPagination });
+    const results$ = this.searchService.search(fullSearchConfig) as Observable<RemoteData<PaginatedList<SearchResult<Item>>>>;
+    results$.pipe(
+      getSucceededRemoteData(),
+      map((resultsRD) => resultsRD.payload.page),
+      tap(() => this.selectAllLoading = false),
+    ).subscribe((results) => {
+        this.selection$
+          .pipe(take(1))
+          .subscribe((selection: Array<SearchResult<Item>>) => {
+            const filteredResults = results.filter((pageItem) => selection.findIndex((selected) => selected.equals(pageItem)) < 0);
+            this.selectObject.emit(...filteredResults);
+          });
+        this.selectableListService.select(this.listId, results);
+      }
+    );
+  }
+
+  /**
+   * Deselect all items
+   */
+  deselectAll() {
+    this.allSelected = false;
+    this.selection$
+      .pipe(take(1))
+      .subscribe((selection: Array<SearchResult<Item>>) => this.deselectObject.emit(...selection));
+    this.selectableListService.deselectAll(this.listId);
+  }
+
+  ngOnDestroy(): void {
+    if (hasValue(this.subscription)) {
+      this.subscription.unsubscribe();
+    }
+  }
+}
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
new file mode 100644
index 0000000000..46ee1727fe
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.html
@@ -0,0 +1,23 @@
+<div class="row">
+    <div class="col-4">
+        <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.settings' | translate}}</h3>
+        <ds-page-size-selector></ds-page-size-selector>
+    </div>
+    <div class="col-8">
+        <div *ngIf="(selectionRD$ | async)?.payload.page < 1">
+            {{'submission.sections.describe.relationship-lookup.selection-tab.no-selection' | translate}}
+        </div>
+        <div *ngIf="(selectionRD$ | async)?.payload.page.length >= 1">
+            <h3>{{ 'submission.sections.describe.relationship-lookup.selection-tab.title.' + label | translate}}</h3>
+            <ds-viewable-collection [objects]="selectionRD$ | async"
+                                    [selectable]="true"
+                                    [selectionConfig]="{ repeatable: repeatable, listId: listId }"
+                                    [config]="initialPagination"
+                                    [hideGear]="true"
+                                    [context]="context"
+                                    (deselectObject)="deselectObject.emit($event)"
+                                    (selectObject)="selectObject.emit($event)"
+            ></ds-viewable-collection>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.scss b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.scss
new file mode 100644
index 0000000000..e69de29bb2
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
new file mode 100644
index 0000000000..18e5d3c3ab
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.spec.ts
@@ -0,0 +1,92 @@
+import { async, ComponentFixture, TestBed } 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/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 { By } from '@angular/platform-browser';
+import { RemoteData } from '../../../../../../core/data/remote-data';
+import { PaginatedList } from '../../../../../../core/data/paginated-list';
+import { ListableObject } from '../../../../../object-collection/shared/listable-object.model';
+import { createSuccessfulRemoteDataObject$ } from '../../../../../testing/utils';
+
+describe('DsDynamicLookupRelationSelectionTabComponent', () => {
+  let component: DsDynamicLookupRelationSelectionTabComponent;
+  let fixture: ComponentFixture<DsDynamicLookupRelationSelectionTabComponent>;
+  let pSearchOptions = new PaginatedSearchOptions({ pagination: new PaginationComponentOptions() });
+  let item1 = Object.assign(new Item(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
+  let item2 = Object.assign(new Item(), { uuid: 'c8279647-1acc-41ae-b036-951d5f65649b' });
+  let searchResult1 = Object.assign(new ItemSearchResult(), { indexableObject: item1 });
+  let searchResult2 = Object.assign(new ItemSearchResult(), { indexableObject: item2 });
+  let listID = '6b0c8221-fcb4-47a8-b483-ca32363fffb3';
+  let selection$;
+  let selectionRD$;
+  let router;
+
+  function init() {
+    pSearchOptions = new PaginatedSearchOptions({ pagination: new PaginationComponentOptions() });
+    item1 = Object.assign(new Item(), { uuid: 'e1c51c69-896d-42dc-8221-1d5f2ad5516e' });
+    item2 = Object.assign(new Item(), { uuid: 'c8279647-1acc-41ae-b036-951d5f65649b' });
+    searchResult1 = Object.assign(new ItemSearchResult(), { indexableObject: item1 });
+    searchResult2 = Object.assign(new ItemSearchResult(), { indexableObject: item2 });
+    listID = '6b0c8221-fcb4-47a8-b483-ca32363fffb3';
+    selection$ = observableOf([searchResult1, searchResult2]);
+    selectionRD$ = createSelection([searchResult1, searchResult2]);
+    router = jasmine.createSpyObj('router', ['navigate'])
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [DsDynamicLookupRelationSelectionTabComponent, VarDirective],
+      imports: [TranslateModule.forRoot()],
+      providers: [
+        {
+          provide: SearchConfigurationService, useValue: {
+            paginatedSearchOptions: observableOf(pSearchOptions)
+          },
+        },
+        {
+          provide: Router, useValue: router
+        }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    })
+      .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(DsDynamicLookupRelationSelectionTabComponent);
+    component = fixture.componentInstance;
+    component.selection$ = selection$;
+    component.listId = listID;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+
+  it('should call navigate on the router when is called resetRoute', () => {
+    component.selectionRD$ = createSelection([]);
+    fixture.detectChanges();
+    const colComponent = fixture.debugElement.query(By.css('ds-viewable-collection'));
+    expect(colComponent).toBe(null);
+  });
+
+  it('should call navigate on the router when is called resetRoute', () => {
+    component.selectionRD$ = selectionRD$;
+    const colComponent = fixture.debugElement.query(By.css('ds-viewable-collection'));
+    expect(colComponent).not.toBe(null);
+  });
+});
+
+function createSelection(content: ListableObject[]): Observable<RemoteData<PaginatedList<ListableObject>>> {
+  return createSuccessfulRemoteDataObject$(new PaginatedList(undefined, content));
+}
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
new file mode 100644
index 0000000000..f4746853f6
--- /dev/null
+++ b/src/app/shared/form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component.ts
@@ -0,0 +1,111 @@
+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 { createSuccessfulRemoteDataObject } from '../../../../../testing/utils';
+import { PaginationComponentOptions } from '../../../../../pagination/pagination-component-options.model';
+import { PaginatedList } from '../../../../../../core/data/paginated-list';
+import { Router } from '@angular/router';
+import { PaginatedSearchOptions } from '../../../../../search/paginated-search-options.model';
+import { PageInfo } from '../../../../../../core/shared/page-info.model';
+import { Context } from '../../../../../../core/shared/context.model';
+
+@Component({
+  selector: 'ds-dynamic-lookup-relation-selection-tab',
+  styleUrls: ['./dynamic-lookup-relation-selection-tab.component.scss'],
+  templateUrl: './dynamic-lookup-relation-selection-tab.component.html',
+  providers: [
+    {
+      provide: SEARCH_CONFIG_SERVICE,
+      useClass: SearchConfigurationService
+    }
+  ]
+})
+
+/**
+ * Tab for inside the lookup model that represents the currently selected relationships
+ */
+export class DsDynamicLookupRelationSelectionTabComponent {
+  /**
+   * The label to use to display i18n messages (describing the type of relationship)
+   */
+  @Input() label: string;
+
+  /**
+   * The ID of the list to add/remove selected items to/from
+   */
+  @Input() listId: string;
+
+  /**
+   * Is the selection repeatable?
+   */
+  @Input() repeatable: boolean;
+
+  /**
+   * The list of selected items
+   */
+  @Input() selection$: Observable<ListableObject[]>;
+
+  /**
+   * The paginated list of selected items
+   */
+  @Input() selectionRD$: Observable<RemoteData<PaginatedList<ListableObject>>>;
+
+  /**
+   * The context to display lists
+   */
+  @Input() context: Context;
+
+  /**
+   * Send an event to deselect an object from the list
+   */
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  /**
+   * Send an event to select an object from the list
+   */
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  /**
+   * The initial pagination to use
+   */
+  initialPagination = Object.assign(new PaginationComponentOptions(), {
+    id: 'submission-relation-list',
+    pageSize: 5
+  });
+
+  constructor(private router: Router,
+              private searchConfigService: SearchConfigurationService) {
+  }
+
+  /**
+   * Set up the selection and pagination on load
+   */
+  ngOnInit() {
+    this.selectionRD$ = this.searchConfigService.paginatedSearchOptions
+      .pipe(
+        map((options: PaginatedSearchOptions) => options.pagination),
+        switchMap((pagination: PaginationComponentOptions) => {
+          return this.selection$.pipe(
+            take(1),
+            map((selected) => {
+              const offset = (pagination.currentPage - 1) * pagination.pageSize;
+              const end = (offset + pagination.pageSize) > selected.length ? selected.length : offset + pagination.pageSize;
+              const selection = selected.slice(offset, end);
+              const pageInfo = new PageInfo(
+                {
+                  elementsPerPage: pagination.pageSize,
+                  totalElements: selected.length,
+                  currentPage: pagination.currentPage,
+                  totalPages: Math.ceil(selected.length / pagination.pageSize)
+                });
+              return createSuccessfulRemoteDataObject(new PaginatedList(pageInfo, selection));
+            })
+          );
+        })
+      )
+  }
+}
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 58a1696a92..ea0957f689 100644
--- a/src/app/shared/form/builder/form-builder.service.spec.ts
+++ b/src/app/shared/form/builder/form-builder.service.spec.ts
@@ -56,6 +56,8 @@ describe('FormBuilderService test suite', () => {
   let testFormConfiguration: SubmissionFormsModel;
   let service: FormBuilderService;
 
+  const submissionId =  '1234';
+
   function testValidator() {
     return {testValidator: {valid: true}};
   }
@@ -193,17 +195,18 @@ describe('FormBuilderService test suite', () => {
 
       new DynamicColorPickerModel({id: 'testColorPicker'}),
 
-      new DynamicTypeaheadModel({id: 'testTypeahead'}),
+      new DynamicTypeaheadModel({id: 'testTypeahead', repeatable: false, metadataFields: [], submissionId: '1234'}),
 
-      new DynamicScrollableDropdownModel({id: 'testScrollableDropdown', authorityOptions: authorityOptions}),
+      new DynamicScrollableDropdownModel({id: 'testScrollableDropdown', authorityOptions: authorityOptions, repeatable: false, metadataFields: [], submissionId: '1234'}),
 
-      new DynamicTagModel({id: 'testTag'}),
+      new DynamicTagModel({id: 'testTag', repeatable: false, metadataFields: [], submissionId: '1234'}),
 
       new DynamicListCheckboxGroupModel({id: 'testCheckboxList', authorityOptions: authorityOptions, repeatable: true}),
 
       new DynamicListRadioGroupModel({id: 'testRadioList', authorityOptions: authorityOptions, repeatable: false}),
 
       new DynamicRelationGroupModel({
+        submissionId,
         id: 'testRelationGroup',
         formConfiguration: [{
           fields: [{
@@ -239,16 +242,18 @@ describe('FormBuilderService test suite', () => {
         name: 'testRelationGroup',
         relationFields: [],
         scopeUUID: '',
-        submissionScope: ''
+        submissionScope: '',
+        repeatable: false,
+        metadataFields: []
       }),
 
       new DynamicDsDatePickerModel({id: 'testDate'}),
 
-      new DynamicLookupModel({id: 'testLookup'}),
+      new DynamicLookupModel({id: 'testLookup', repeatable: false, metadataFields: [], submissionId: '1234'}),
 
-      new DynamicLookupNameModel({id: 'testLookupName'}),
+      new DynamicLookupNameModel({id: 'testLookupName', repeatable: false, metadataFields: [], submissionId: '1234'}),
 
-      new DynamicQualdropModel({id: 'testCombobox', readOnly: false}),
+      new DynamicQualdropModel({id: 'testCombobox', readOnly: false, required: false}),
 
       new DynamicRowArrayModel(
         {
@@ -260,6 +265,7 @@ describe('FormBuilderService test suite', () => {
               new DynamicInputModel({id: 'testFormRowArrayGroupInput'})
             ];
           },
+          required: false
         }
       ),
     ];
@@ -406,7 +412,7 @@ describe('FormBuilderService test suite', () => {
   });
 
   it('should create an array of form models', () => {
-    const formModel = service.modelFromConfiguration(testFormConfiguration, 'testScopeUUID');
+    const formModel = service.modelFromConfiguration(submissionId, testFormConfiguration, 'testScopeUUID');
 
     expect(formModel[0] instanceof DynamicRowGroupModel).toBe(true);
     expect((formModel[0] as DynamicRowGroupModel).group.length).toBe(3);
@@ -427,7 +433,7 @@ describe('FormBuilderService test suite', () => {
   });
 
   it('should return form\'s fields value from form model', () => {
-    const formModel = service.modelFromConfiguration(testFormConfiguration, 'testScopeUUID');
+    const formModel = service.modelFromConfiguration(submissionId, testFormConfiguration, 'testScopeUUID');
     let value = {} as any;
 
     expect(service.getValueFromModel(formModel)).toEqual(value);
@@ -448,7 +454,7 @@ describe('FormBuilderService test suite', () => {
   });
 
   it('should clear all form\'s fields value', () => {
-    const formModel = service.modelFromConfiguration(testFormConfiguration, 'testScopeUUID');
+    const formModel = service.modelFromConfiguration(submissionId, testFormConfiguration, 'testScopeUUID');
     const value = {} as any;
 
     ((formModel[0] as DynamicRowGroupModel).get(1) as DsDynamicInputModel).valueUpdates.next('test');
@@ -460,7 +466,7 @@ describe('FormBuilderService test suite', () => {
   });
 
   it('should return true when model has a custom group model as parent', () => {
-    const formModel = service.modelFromConfiguration(testFormConfiguration, 'testScopeUUID');
+    const formModel = service.modelFromConfiguration(submissionId, testFormConfiguration, 'testScopeUUID');
     let model = service.findById('dc_identifier_QUALDROP_VALUE', formModel);
     let modelParent = service.findById('dc_identifier_QUALDROP_GROUP', formModel);
     model.parent = modelParent;
@@ -489,7 +495,7 @@ describe('FormBuilderService test suite', () => {
   });
 
   it('should return true when model value is a map', () => {
-    const formModel = service.modelFromConfiguration(testFormConfiguration, 'testScopeUUID');
+    const formModel = service.modelFromConfiguration(submissionId, testFormConfiguration, 'testScopeUUID');
     const model = service.findById('dc_identifier_QUALDROP_VALUE', formModel);
     const modelParent = service.findById('dc_identifier_QUALDROP_GROUP', formModel);
     model.parent = modelParent;
@@ -498,7 +504,7 @@ describe('FormBuilderService test suite', () => {
   });
 
   it('should return true when model is a Qualdrop Group', () => {
-    const formModel = service.modelFromConfiguration(testFormConfiguration, 'testScopeUUID');
+    const formModel = service.modelFromConfiguration(submissionId, testFormConfiguration, 'testScopeUUID');
     let model = service.findById('dc_identifier_QUALDROP_GROUP', formModel);
 
     expect(service.isQualdropGroup(model)).toBe(true);
@@ -509,7 +515,7 @@ describe('FormBuilderService test suite', () => {
   });
 
   it('should return true when model is a Custom or List Group', () => {
-    const formModel = service.modelFromConfiguration(testFormConfiguration, 'testScopeUUID');
+    const formModel = service.modelFromConfiguration(submissionId, testFormConfiguration, 'testScopeUUID');
     let model = service.findById('dc_identifier_QUALDROP_GROUP', formModel);
 
     expect(service.isCustomOrListGroup(model)).toBe(true);
@@ -528,7 +534,7 @@ describe('FormBuilderService test suite', () => {
   });
 
   it('should return true when model is a Custom Group', () => {
-    const formModel = service.modelFromConfiguration(testFormConfiguration, 'testScopeUUID');
+    const formModel = service.modelFromConfiguration(submissionId, testFormConfiguration, 'testScopeUUID');
     let model = service.findById('dc_identifier_QUALDROP_GROUP', formModel);
 
     expect(service.isCustomGroup(model)).toBe(true);
diff --git a/src/app/shared/form/builder/form-builder.service.ts b/src/app/shared/form/builder/form-builder.service.ts
index 21e702aabb..bd5728668c 100644
--- a/src/app/shared/form/builder/form-builder.service.ts
+++ b/src/app/shared/form/builder/form-builder.service.ts
@@ -10,9 +10,8 @@ import {
   DynamicFormArrayModel,
   DynamicFormControlModel,
   DynamicFormGroupModel,
-  DynamicFormService,
-  DynamicPathable,
-  JSONUtils,
+  DynamicFormService, DynamicFormValidationService,
+  DynamicPathable, parseReviver,
 } from '@ng-dynamic-forms/core';
 import { isObject, isString, mergeWith } from 'lodash';
 
@@ -21,10 +20,7 @@ import { DynamicQualdropModel } from './ds-dynamic-form-ui/models/ds-dynamic-qua
 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 {
-  DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP,
-  DynamicRelationGroupModel
-} from './ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP, 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';
@@ -33,6 +29,13 @@ import { isNgbDateStruct } from '../../date.util';
 @Injectable()
 export class FormBuilderService extends DynamicFormService {
 
+  constructor(
+    validationService: DynamicFormValidationService,
+    protected rowParser: RowParser
+  ) {
+    super(validationService);
+  }
+
   findById(id: string, groupModel: DynamicFormControlModel[], arrayIndex = null): DynamicFormControlModel | null {
 
     let result = null;
@@ -198,13 +201,13 @@ export class FormBuilderService extends DynamicFormService {
     return result;
   }
 
-  modelFromConfiguration(json: string | SubmissionFormsModel, scopeUUID: string, initFormValues: any = {}, submissionScope?: string, readOnly = false): DynamicFormControlModel[] | never {
+  modelFromConfiguration(submissionId: string, json: string | SubmissionFormsModel, scopeUUID: string, sectionData: any = {}, submissionScope?: string, readOnly = false): DynamicFormControlModel[] | never {
     let rows: DynamicFormControlModel[] = [];
-    const rawData = typeof json === 'string' ? JSON.parse(json, JSONUtils.parseReviver) : json;
+    const rawData = typeof json === 'string' ? JSON.parse(json, parseReviver) : json;
 
     if (rawData.rows && !isEmpty(rawData.rows)) {
       rawData.rows.forEach((currentRow) => {
-        const rowParsed = new RowParser(currentRow, scopeUUID, initFormValues, submissionScope, readOnly).parse();
+        const rowParsed = this.rowParser.parse(submissionId, currentRow, scopeUUID, sectionData, submissionScope, readOnly);
         if (isNotNull(rowParsed)) {
           if (Array.isArray(rowParsed)) {
             rows = rows.concat(rowParsed);
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 39f2d6b9f8..718b3f4f0d 100644
--- a/src/app/shared/form/builder/models/form-field.model.ts
+++ b/src/app/shared/form/builder/models/form-field.model.ts
@@ -1,6 +1,7 @@
 import { autoserialize } from 'cerialize';
 import { LanguageCode } from './form-field-language-value.model';
 import { FormFieldMetadataValueObject } from './form-field-metadata-value.model';
+import { RelationshipOptions } from './relationship-options.model';
 import { FormRowModel } from '../../../../core/config/models/config-submission-form.model';
 
 export class FormFieldModel {
@@ -32,6 +33,9 @@ export class FormFieldModel {
   @autoserialize
   selectableMetadata: FormFieldMetadataValueObject[];
 
+  @autoserialize
+  selectableRelationship: RelationshipOptions;
+
   @autoserialize
   rows: FormRowModel[];
 
diff --git a/src/app/shared/form/builder/models/relationship-options.model.ts b/src/app/shared/form/builder/models/relationship-options.model.ts
new file mode 100644
index 0000000000..f1d3d0ae7a
--- /dev/null
+++ b/src/app/shared/form/builder/models/relationship-options.model.ts
@@ -0,0 +1,15 @@
+const RELATION_METADATA_PREFIX = 'relation.'
+
+/**
+ * The submission options for fields that can represent relationships
+ */
+export class RelationshipOptions {
+  relationshipType: string;
+  filter: string;
+  searchConfiguration: string;
+  nameVariants: boolean;
+
+  get metadataField() {
+    return RELATION_METADATA_PREFIX + this.relationshipType
+  }
+}
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 6323905555..33a92c726d 100644
--- a/src/app/shared/form/builder/parsers/concat-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/concat-field-parser.ts
@@ -1,7 +1,11 @@
-import { FieldParser } from './field-parser';
+import { Inject } from '@angular/core';
 import { FormFieldModel } from '../models/form-field.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
-import { DynamicFormControlLayout, DynamicInputModel, DynamicInputModelConfig } from '@ng-dynamic-forms/core';
+import {
+  DynamicFormControlLayout,
+  DynamicInputModel,
+  DynamicInputModelConfig
+} from '@ng-dynamic-forms/core';
 import {
   CONCAT_FIRST_INPUT_SUFFIX,
   CONCAT_GROUP_SUFFIX,
@@ -11,16 +15,25 @@ import {
 } from '../ds-dynamic-form-ui/models/ds-dynamic-concat.model';
 import { isNotEmpty } from '../../../empty.util';
 import { ParserOptions } from './parser-options';
+import {
+  CONFIG_DATA,
+  FieldParser,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+  SUBMISSION_ID
+} from './field-parser';
 
 export class ConcatFieldParser extends FieldParser {
 
-  constructor(protected configData: FormFieldModel,
-              protected initFormValues,
-              protected parserOptions: ParserOptions,
-              protected separator: string,
-              protected firstPlaceholder: string = null,
-              protected secondPlaceholder: string = null) {
-    super(configData, initFormValues, parserOptions);
+  constructor(
+    @Inject(SUBMISSION_ID) submissionId: string,
+    @Inject(CONFIG_DATA) configData: FormFieldModel,
+    @Inject(INIT_FORM_VALUES) initFormValues,
+    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions,
+    protected separator: string,
+    protected firstPlaceholder: string = null,
+    protected secondPlaceholder: string = null) {
+    super(submissionId, configData, initFormValues, parserOptions);
 
     this.separator = separator;
     this.firstPlaceholder = firstPlaceholder;
@@ -40,16 +53,17 @@ export class ConcatFieldParser extends FieldParser {
     };
 
     const groupId = id.replace(/\./g, '_') + CONCAT_GROUP_SUFFIX;
-    const concatGroup: DynamicConcatModelConfig = this.initModel(groupId, false, false);
+    const concatGroup: DynamicConcatModelConfig = this.initModel(groupId, label, false);
 
     concatGroup.group = [];
     concatGroup.separator = this.separator;
 
-    const input1ModelConfig: DynamicInputModelConfig = this.initModel(id + CONCAT_FIRST_INPUT_SUFFIX, label, false, false);
-    const input2ModelConfig: DynamicInputModelConfig = this.initModel(id + CONCAT_SECOND_INPUT_SUFFIX, label, true, false);
+    const input1ModelConfig: DynamicInputModelConfig = this.initModel(id + CONCAT_FIRST_INPUT_SUFFIX, false, false);
+    const input2ModelConfig: DynamicInputModelConfig = this.initModel(id + CONCAT_SECOND_INPUT_SUFFIX, false, false);
     input2ModelConfig.hint = '&nbsp;';
 
     if (this.configData.mandatory) {
+      concatGroup.required = true;
       input1ModelConfig.required = true;
     }
 
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 bbcfa60621..efa4f3cdb5 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,6 +1,4 @@
 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 { DateFieldParser } from './date-field-parser';
 import { DynamicDsDatePickerModel } from '../ds-dynamic-form-ui/models/date-picker/date-picker.model';
 import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
@@ -10,6 +8,7 @@ describe('DateFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
 
+  const submissionId = '1234';
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: null,
@@ -37,13 +36,13 @@ describe('DateFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new DateFieldParser(field, initFormValues, parserOptions);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(parser instanceof DateFieldParser).toBe(true);
   });
 
   it('should return a DynamicDsDatePickerModel object when repeatable option is false', () => {
-    const parser = new DateFieldParser(field, initFormValues, parserOptions);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -56,7 +55,7 @@ describe('DateFieldParser test suite', () => {
     };
     const expectedValue = '1983-11-18';
 
-    const parser = new DateFieldParser(field, initFormValues, parserOptions);
+    const parser = new DateFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
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
new file mode 100644
index 0000000000..7dce05f18d
--- /dev/null
+++ b/src/app/shared/form/builder/parsers/disabled-field-parser.spec.ts
@@ -0,0 +1,66 @@
+import { FormFieldModel } from '../models/form-field.model';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { ParserOptions } from './parser-options';
+import { DisabledFieldParser } from './disabled-field-parser';
+import { DynamicDisabledModel } from '../ds-dynamic-form-ui/models/disabled/dynamic-disabled.model';
+
+describe('DisabledFieldParser test suite', () => {
+  let field: FormFieldModel;
+  let initFormValues: any = {};
+
+  const submissionId = '1234';
+  const parserOptions: ParserOptions = {
+    readOnly: false,
+    submissionScope: null,
+    authorityUuid: null
+  };
+
+  beforeEach(() => {
+    field = {
+      input: {
+        type: ''
+      },
+      label: 'Description',
+      mandatory: 'false',
+      repeatable: false,
+      hints: 'Enter a description.',
+      selectableMetadata: [
+        {
+          metadata: 'description'
+        }
+      ],
+      languageCodes: []
+    } as FormFieldModel;
+
+  });
+
+  it('should init parser properly', () => {
+    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions);
+
+    expect(parser instanceof DisabledFieldParser).toBe(true);
+  });
+
+  it('should return a DynamicDisabledModel object when repeatable option is false', () => {
+    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions);
+
+    const fieldModel = parser.parse();
+
+    expect(fieldModel instanceof DynamicDisabledModel).toBe(true);
+  });
+
+  it('should set init value properly', () => {
+    initFormValues = {
+      description: [
+        new FormFieldMetadataValueObject('test description'),
+      ],
+    };
+    const expectedValue ='test description';
+
+    const parser = new DisabledFieldParser(submissionId, field, initFormValues, parserOptions);
+
+    const fieldModel = parser.parse();
+    console.log(fieldModel);
+    expect(fieldModel.value).toEqual(expectedValue);
+  });
+
+});
diff --git a/src/app/shared/form/builder/parsers/disabled-field-parser.ts b/src/app/shared/form/builder/parsers/disabled-field-parser.ts
new file mode 100644
index 0000000000..db3e4ac8b9
--- /dev/null
+++ b/src/app/shared/form/builder/parsers/disabled-field-parser.ts
@@ -0,0 +1,16 @@
+import { FieldParser } from './field-parser';
+import { FormFieldMetadataValueObject } from '../models/form-field-metadata-value.model';
+import { DsDynamicDisabledModelConfig, DynamicDisabledModel } from '../ds-dynamic-form-ui/models/disabled/dynamic-disabled.model';
+
+/**
+ * Field parser for disabled fields
+ */
+export class DisabledFieldParser extends FieldParser {
+
+  public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
+    console.log(fieldValue);
+    const emptyModelConfig: DsDynamicDisabledModelConfig = this.initModel(null, label);
+    this.setValues(emptyModelConfig, fieldValue);
+    return new DynamicDisabledModel(emptyModelConfig)
+  }
+}
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 5dfdcfa5ce..8dbd68e05a 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
@@ -6,6 +6,7 @@ import { ParserOptions } from './parser-options';
 describe('DropdownFieldParser test suite', () => {
   let field: FormFieldModel;
 
+  const submissionId = '1234';
   const initFormValues = {};
   const parserOptions: ParserOptions = {
     readOnly: false,
@@ -35,13 +36,13 @@ describe('DropdownFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new DropdownFieldParser(field, initFormValues, parserOptions);
+    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(parser instanceof DropdownFieldParser).toBe(true);
   });
 
   it('should return a DynamicScrollableDropdownModel object when repeatable option is false', () => {
-    const parser = new DropdownFieldParser(field, initFormValues, parserOptions);
+    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -50,7 +51,7 @@ describe('DropdownFieldParser test suite', () => {
 
   it('should throw when authority is not passed', () => {
     field.selectableMetadata[0].authority = null;
-    const parser = new DropdownFieldParser(field, initFormValues, parserOptions);
+    const parser = new DropdownFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(() => parser.parse())
       .toThrow();
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 1623829b15..4816a2a073 100644
--- a/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/dropdown-field-parser.ts
@@ -1,4 +1,12 @@
-import { FieldParser } from './field-parser';
+import { Inject } from '@angular/core';
+import { FormFieldModel } from '../models/form-field.model';
+import {
+  CONFIG_DATA,
+  FieldParser,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+  SUBMISSION_ID
+} from './field-parser';
 import { DynamicFormControlLayout, } from '@ng-dynamic-forms/core';
 import {
   DynamicScrollableDropdownModel,
@@ -6,9 +14,19 @@ import {
 } 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 {
 
+  constructor(
+    @Inject(SUBMISSION_ID) submissionId: string,
+    @Inject(CONFIG_DATA) configData: FormFieldModel,
+    @Inject(INIT_FORM_VALUES) initFormValues,
+    @Inject(PARSER_OPTIONS) parserOptions: ParserOptions
+  ) {
+    super(submissionId, configData, initFormValues, parserOptions)
+  }
+
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean): any {
     const dropdownModelConfig: DynamicScrollableDropdownModelConfig = this.initModel(null, label);
     let layout: DynamicFormControlLayout;
diff --git a/src/app/shared/form/builder/parsers/field-parser.ts b/src/app/shared/form/builder/parsers/field-parser.ts
index dd37a45fba..f7bf12353c 100644
--- a/src/app/shared/form/builder/parsers/field-parser.ts
+++ b/src/app/shared/form/builder/parsers/field-parser.ts
@@ -1,4 +1,5 @@
-import { hasValue, isNotEmpty, isNotNull, isNotUndefined } from '../../../empty.util';
+import { Inject, InjectionToken } from '@angular/core';
+import { hasValue, isNotEmpty, isNotNull, isNotUndefined, isEmpty } from '../../../empty.util';
 import { FormFieldModel } from '../models/form-field.model';
 
 import { uniqueId } from 'lodash';
@@ -12,12 +13,23 @@ import { DynamicFormControlLayout } from '@ng-dynamic-forms/core';
 import { setLayout } from './parser.utils';
 import { AuthorityOptions } from '../../../../core/integration/models/authority-options.model';
 import { ParserOptions } from './parser-options';
+import { RelationshipOptions } from '../models/relationship-options.model';
+
+export const SUBMISSION_ID: InjectionToken<string> = new InjectionToken<string>('submissionId');
+export const CONFIG_DATA: InjectionToken<FormFieldModel> = new InjectionToken<FormFieldModel>('configData');
+export const INIT_FORM_VALUES: InjectionToken<any> = new InjectionToken<any>('initFormValues');
+export const PARSER_OPTIONS: InjectionToken<ParserOptions> = new InjectionToken<ParserOptions>('parserOptions');
 
 export abstract class FieldParser {
 
   protected fieldId: string;
 
-  constructor(protected configData: FormFieldModel, protected initFormValues, protected parserOptions: ParserOptions) {
+  constructor(
+    @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
+  ) {
   }
 
   public abstract modelFactory(fieldValue?: FormFieldMetadataValueObject, label?: boolean): any;
@@ -27,6 +39,7 @@ export abstract class FieldParser {
       && (this.configData.input.type !== 'list')
       && (this.configData.input.type !== 'tag')
       && (this.configData.input.type !== 'group')
+      && isEmpty(this.configData.selectableRelationship)
     ) {
       let arrayCounter = 0;
       let fieldArrayCounter = 0;
@@ -36,6 +49,7 @@ export abstract class FieldParser {
         label: this.configData.label,
         initialCount: this.getInitArrayIndex(),
         notRepeatable: !this.configData.repeatable,
+        required: isNotEmpty(this.configData.mandatory),
         groupFactory: () => {
           let model;
           if ((arrayCounter === 0)) {
@@ -71,7 +85,7 @@ export abstract class FieldParser {
 
     } else {
       const model = this.modelFactory(this.getInitFieldValue());
-      if (model.hasLanguages) {
+      if (model.hasLanguages || isNotEmpty(model.relationship)) {
         setLayout(model, 'grid', 'control', 'col');
       }
       return model;
@@ -164,11 +178,11 @@ export abstract class FieldParser {
         return ids;
       }
     } else {
-      return null;
+      return [this.configData.selectableRelationship.relationshipType];
     }
   }
 
-  protected initModel(id?: string, label = true, labelEmpty = false, setErrors = true) {
+  protected initModel(id?: string, label = true, setErrors = true) {
 
     const controlModel = Object.create(null);
 
@@ -184,9 +198,15 @@ export abstract class FieldParser {
     // Set read only option
     controlModel.readOnly = this.parserOptions.readOnly;
     controlModel.disabled = this.parserOptions.readOnly;
+    if (hasValue(this.configData.selectableRelationship)) {
+      controlModel.relationship = Object.assign(new RelationshipOptions(), this.configData.selectableRelationship);
+    }
+    controlModel.repeatable = this.configData.repeatable;
+    controlModel.metadataFields = isNotEmpty(this.configData.selectableMetadata) ? this.configData.selectableMetadata.map((metadataObject) => metadataObject.metadata) : [];
+    controlModel.submissionId = this.submissionId;
 
     // Set label
-    this.setLabel(controlModel, label, labelEmpty);
+    this.setLabel(controlModel, label);
 
     controlModel.placeholder = this.configData.label;
 
@@ -204,14 +224,14 @@ export abstract class FieldParser {
     if (this.configData.languageCodes && this.configData.languageCodes.length > 0) {
       (controlModel as DsDynamicInputModel).languageCodes = this.configData.languageCodes;
     }
-/*    (controlModel as DsDynamicInputModel).languageCodes = [{
-        display: 'English',
-        code: 'en_US'
-      },
-      {
-        display: 'Italian',
-        code: 'it_IT'
-      }];*/
+    /*    (controlModel as DsDynamicInputModel).languageCodes = [{
+            display: 'English',
+            code: 'en_US'
+          },
+          {
+            display: 'Italian',
+            code: 'it_IT'
+          }];*/
 
     return controlModel;
   }
@@ -222,26 +242,26 @@ export abstract class FieldParser {
 
   protected addPatternValidator(controlModel) {
     const regex = new RegExp(this.configData.input.regex);
-    controlModel.validators = Object.assign({}, controlModel.validators, {pattern: regex});
+    controlModel.validators = Object.assign({}, controlModel.validators, { pattern: regex });
     controlModel.errorMessages = Object.assign(
       {},
       controlModel.errorMessages,
-      {pattern: 'error.validation.pattern'});
+      { pattern: 'error.validation.pattern' });
 
   }
 
   protected markAsRequired(controlModel) {
     controlModel.required = true;
-    controlModel.validators = Object.assign({}, controlModel.validators, {required: null});
+    controlModel.validators = Object.assign({}, controlModel.validators, { required: null });
     controlModel.errorMessages = Object.assign(
       {},
       controlModel.errorMessages,
-      {required: this.configData.mandatoryMessage});
+      { required: this.configData.mandatoryMessage });
   }
 
   protected setLabel(controlModel, label = true, labelEmpty = false) {
     if (label) {
-      controlModel.label = (labelEmpty) ? '&nbsp;' : this.configData.label;
+      controlModel.label = this.configData.label;
     }
   }
 
@@ -253,13 +273,13 @@ export abstract class FieldParser {
         if (key === 0) {
           controlModel.value = option.metadata;
         }
-        controlModel.options.push({label: option.label, value: option.metadata});
+        controlModel.options.push({ label: option.label, value: option.metadata });
       });
     }
   }
 
   public setAuthorityOptions(controlModel, authorityUuid) {
-    if (isNotEmpty(this.configData.selectableMetadata[0].authority)) {
+    if (isNotEmpty(this.configData.selectableMetadata) && isNotEmpty(this.configData.selectableMetadata[0].authority)) {
       controlModel.authorityOptions = new AuthorityOptions(
         this.configData.selectableMetadata[0].authority,
         this.configData.selectableMetadata[0].metadata,
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 b2fa0b2089..fab5ec3888 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
@@ -9,6 +9,7 @@ describe('ListFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
 
+  const submissionId = '1234';
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
@@ -37,13 +38,13 @@ describe('ListFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new ListFieldParser(field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(parser instanceof ListFieldParser).toBe(true);
   });
 
   it('should return a DynamicListCheckboxGroupModel object when repeatable option is true', () => {
-    const parser = new ListFieldParser(field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -52,7 +53,7 @@ describe('ListFieldParser test suite', () => {
 
   it('should return a DynamicListRadioGroupModel object when repeatable option is false', () => {
     field.repeatable = false;
-    const parser = new ListFieldParser(field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -65,7 +66,7 @@ describe('ListFieldParser test suite', () => {
     };
     const expectedValue = [new FormFieldMetadataValueObject('test type')];
 
-    const parser = new ListFieldParser(field, initFormValues, parserOptions);
+    const parser = new ListFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
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 c45d39d5bb..5e14e0c013 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
@@ -8,6 +8,7 @@ describe('LookupFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
 
+  const submissionId = '1234';
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
@@ -36,13 +37,13 @@ describe('LookupFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new LookupFieldParser(field, initFormValues, parserOptions);
+    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(parser instanceof LookupFieldParser).toBe(true);
   });
 
   it('should return a DynamicLookupModel object when repeatable option is false', () => {
-    const parser = new LookupFieldParser(field, initFormValues, parserOptions);
+    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -55,7 +56,7 @@ describe('LookupFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test journal');
 
-    const parser = new LookupFieldParser(field, initFormValues, parserOptions);
+    const parser = new LookupFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
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 b324ba7a7e..adc1e90166 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,5 @@
 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 { LookupNameFieldParser } from './lookup-name-field-parser';
 import { DynamicLookupNameModel } from '../ds-dynamic-form-ui/models/lookup/dynamic-lookup-name.model';
 import { ParserOptions } from './parser-options';
@@ -10,6 +8,7 @@ describe('LookupNameFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
 
+  const submissionId = '1234';
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
@@ -38,13 +37,13 @@ describe('LookupNameFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new LookupNameFieldParser(field, initFormValues, parserOptions);
+    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(parser instanceof LookupNameFieldParser).toBe(true);
   });
 
   it('should return a DynamicLookupNameModel object when repeatable option is false', () => {
-    const parser = new LookupNameFieldParser(field, initFormValues, parserOptions);
+    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -57,7 +56,7 @@ describe('LookupNameFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test author');
 
-    const parser = new LookupNameFieldParser(field, initFormValues, parserOptions);
+    const parser = new LookupNameFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
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 889244e8f2..1b0c637030 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
@@ -10,6 +10,7 @@ describe('NameFieldParser test suite', () => {
   let field3: FormFieldModel;
   let initFormValues: any = {};
 
+  const submissionId = '1234';
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
@@ -69,13 +70,13 @@ describe('NameFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new NameFieldParser(field1, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions);
 
     expect(parser instanceof NameFieldParser).toBe(true);
   });
 
   it('should return a DynamicConcatModel object when repeatable option is false', () => {
-    const parser = new NameFieldParser(field2, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field2, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -83,7 +84,7 @@ describe('NameFieldParser test suite', () => {
   });
 
   it('should return a DynamicConcatModel object with the correct separator', () => {
-    const parser = new NameFieldParser(field2, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field2, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -96,7 +97,7 @@ describe('NameFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test, name');
 
-    const parser = new NameFieldParser(field1, initFormValues, parserOptions);
+    const parser = new NameFieldParser(submissionId, field1, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
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 896b3cc478..e5ecb034ea 100644
--- a/src/app/shared/form/builder/parsers/name-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/name-field-parser.ts
@@ -1,10 +1,17 @@
+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 { ParserOptions } from './parser-options';
 
 export class NameFieldParser extends ConcatFieldParser {
 
-  constructor(protected configData: FormFieldModel, protected initFormValues, protected parserOptions: ParserOptions) {
-    super(configData, initFormValues, parserOptions, ',', 'form.last-name', 'form.first-name');
+  constructor(
+    @Inject(SUBMISSION_ID) submissionId: string,
+    @Inject(CONFIG_DATA) configData: FormFieldModel,
+    @Inject(INIT_FORM_VALUES) initFormValues,
+    @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 89c576bf3a..4668b3017d 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
@@ -10,6 +10,7 @@ describe('OneboxFieldParser test suite', () => {
   let field2: FormFieldModel;
   let field3: FormFieldModel;
 
+  const submissionId = '1234';
   const initFormValues = {};
   const parserOptions: ParserOptions = {
     readOnly: false,
@@ -70,13 +71,13 @@ describe('OneboxFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new OneboxFieldParser(field1, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions);
 
     expect(parser instanceof OneboxFieldParser).toBe(true);
   });
 
   it('should return a DynamicQualdropModel object when selectableMetadata is multiple', () => {
-    const parser = new OneboxFieldParser(field2, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field2, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -84,7 +85,7 @@ describe('OneboxFieldParser test suite', () => {
   });
 
   it('should return a DsDynamicInputModel object when selectableMetadata is not multiple', () => {
-    const parser = new OneboxFieldParser(field3, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field3, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -92,7 +93,7 @@ describe('OneboxFieldParser test suite', () => {
   });
 
   it('should return a DynamicTypeaheadModel object when selectableMetadata has authority', () => {
-    const parser = new OneboxFieldParser(field1, initFormValues, parserOptions);
+    const parser = new OneboxFieldParser(submissionId, field1, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
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 284656cc95..d69c9d4677 100644
--- a/src/app/shared/form/builder/parsers/onebox-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/onebox-field-parser.ts
@@ -56,8 +56,10 @@ export class OneboxFieldParser extends FieldParser {
       inputSelectGroup.group = [];
       inputSelectGroup.legend = this.configData.label;
       inputSelectGroup.hint = this.configData.hints;
+      this.setLabel(inputSelectGroup, label);
+      inputSelectGroup.required = isNotEmpty(this.configData.mandatory);
 
-      const selectModelConfig: DynamicSelectModelConfig<any> = this.initModel(newId + QUALDROP_METADATA_SUFFIX, label);
+      const selectModelConfig: DynamicSelectModelConfig<any> = this.initModel(newId + QUALDROP_METADATA_SUFFIX, label, false);
       selectModelConfig.hint = null;
       this.setOptions(selectModelConfig);
       if (isNotEmpty(fieldValue)) {
@@ -65,11 +67,11 @@ export class OneboxFieldParser extends FieldParser {
       }
       inputSelectGroup.group.push(new DynamicSelectModel(selectModelConfig, clsSelect));
 
-      const inputModelConfig: DsDynamicInputModelConfig = this.initModel(newId + QUALDROP_VALUE_SUFFIX, label, true);
+      const inputModelConfig: DsDynamicInputModelConfig = this.initModel(newId + QUALDROP_VALUE_SUFFIX, label, false);
       inputModelConfig.hint = null;
       this.setValues(inputModelConfig, fieldValue);
-
       inputSelectGroup.readOnly = selectModelConfig.disabled && inputModelConfig.readOnly;
+
       inputSelectGroup.group.push(new DsDynamicInputModel(inputModelConfig, clsInput));
 
       return new DynamicQualdropModel(inputSelectGroup, clsGroup);
diff --git a/src/app/shared/form/builder/parsers/parser-factory.ts b/src/app/shared/form/builder/parsers/parser-factory.ts
index 2cbee18783..d674007da4 100644
--- a/src/app/shared/form/builder/parsers/parser-factory.ts
+++ b/src/app/shared/form/builder/parsers/parser-factory.ts
@@ -1,6 +1,12 @@
+import { StaticProvider } from '@angular/core';
 import { ParserType } from './parser-type';
-import { GenericConstructor } from '../../../../core/shared/generic-constructor';
-import { FieldParser } from './field-parser';
+import {
+  CONFIG_DATA,
+  FieldParser,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+  SUBMISSION_ID
+} from './field-parser';
 import { DateFieldParser } from './date-field-parser';
 import { DropdownFieldParser } from './dropdown-field-parser';
 import { RelationGroupFieldParser } from './relation-group-field-parser';
@@ -12,44 +18,105 @@ import { NameFieldParser } from './name-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,
+  CONFIG_DATA,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+];
+
+/**
+ * Method to retrieve a field parder with its providers based on the input type
+ */
 export class ParserFactory {
-  public static getConstructor(type: ParserType): GenericConstructor<FieldParser> {
+  public static getProvider(type: ParserType): StaticProvider {
     switch (type) {
       case ParserType.Date: {
-        return DateFieldParser
+        return {
+          provide: FieldParser,
+          useClass: DateFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
       case ParserType.Dropdown: {
-        return DropdownFieldParser
+        return {
+          provide: FieldParser,
+          useClass: DropdownFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
       case ParserType.RelationGroup: {
-        return RelationGroupFieldParser
+        return {
+          provide: FieldParser,
+          useClass: RelationGroupFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
       case ParserType.List: {
-        return ListFieldParser
+        return {
+          provide: FieldParser,
+          useClass: ListFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
       case ParserType.Lookup: {
-        return LookupFieldParser
+        return {
+          provide: FieldParser,
+          useClass: LookupFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
       case ParserType.LookupName: {
-        return LookupNameFieldParser
+        return {
+          provide: FieldParser,
+          useClass: LookupNameFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
       case ParserType.Onebox: {
-        return OneboxFieldParser
+        return {
+          provide: FieldParser,
+          useClass: OneboxFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
       case ParserType.Name: {
-        return NameFieldParser
+        return {
+          provide: FieldParser,
+          useClass: NameFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
       case ParserType.Series: {
-        return SeriesFieldParser
+        return {
+          provide: FieldParser,
+          useClass: SeriesFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
       case ParserType.Tag: {
-        return TagFieldParser
+        return {
+          provide: FieldParser,
+          useClass: TagFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
       case ParserType.Textarea: {
-        return TextareaFieldParser
+        return {
+          provide: FieldParser,
+          useClass: TextareaFieldParser,
+          deps: [...fieldParserDeps]
+        }
+      }
+      case undefined: {
+        return {
+          provide: FieldParser,
+          useClass: DisabledFieldParser,
+          deps: [...fieldParserDeps]
+        }
       }
-
       default: {
         return undefined;
       }
diff --git a/src/app/shared/form/builder/parsers/parser-type.ts b/src/app/shared/form/builder/parsers/parser-type.ts
index a9af87d73f..f43d4654a0 100644
--- a/src/app/shared/form/builder/parsers/parser-type.ts
+++ b/src/app/shared/form/builder/parsers/parser-type.ts
@@ -5,6 +5,7 @@ export enum ParserType {
   List = 'list',
   Lookup = 'lookup',
   LookupName = 'lookup-name',
+  LookupRelation = 'lookup-relation',
   Onebox = 'onebox',
   Name = 'name',
   Series = 'series',
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 e6bf0dc2c8..84f3df0365 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
@@ -8,6 +8,7 @@ describe('RelationGroupFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues = {};
 
+  const submissionId = '1234';
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
@@ -71,13 +72,13 @@ describe('RelationGroupFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new RelationGroupFieldParser(field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(parser instanceof RelationGroupFieldParser).toBe(true);
   });
 
   it('should return a DynamicRelationGroupModel object', () => {
-    const parser = new RelationGroupFieldParser(field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -86,7 +87,7 @@ describe('RelationGroupFieldParser test suite', () => {
 
   it('should throw when rows configuration is empty', () => {
     field.rows = null;
-    const parser = new RelationGroupFieldParser(field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(() => parser.parse())
       .toThrow();
@@ -97,7 +98,7 @@ describe('RelationGroupFieldParser test suite', () => {
       author: [new FormFieldMetadataValueObject('test author')],
       affiliation: [new FormFieldMetadataValueObject('test affiliation')]
     };
-    const parser = new RelationGroupFieldParser(field, initFormValues, parserOptions);
+    const parser = new RelationGroupFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
     const 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 b3f6e749f3..01699d9e78 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
@@ -15,6 +15,7 @@ export class RelationGroupFieldParser extends FieldParser {
   public modelFactory(fieldValue?: FormFieldMetadataValueObject | any, label?: boolean) {
     const modelConfiguration: DynamicRelationGroupModelConfig = this.initModel(null, label);
 
+    modelConfiguration.submissionId = this.submissionId;
     modelConfiguration.scopeUUID = this.parserOptions.authorityUuid;
     modelConfiguration.submissionScope = this.parserOptions.submissionScope;
     if (this.configData && this.configData.rows && this.configData.rows.length > 0) {
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 58b1d1de99..435c6a6426 100644
--- a/src/app/shared/form/builder/parsers/row-parser.spec.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.spec.ts
@@ -17,6 +17,7 @@ describe('RowParser test suite', () => {
   let row9: FormRowModel;
   let row10: FormRowModel;
 
+  const submissionId = '1234';
   const scopeUUID = 'testScopeUUID';
   const initFormValues = {};
   const submissionScope = 'WORKSPACE';
@@ -328,76 +329,98 @@ describe('RowParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    let parser = new RowParser(row1, scopeUUID, initFormValues, submissionScope, readOnly);
-
-    expect(parser instanceof RowParser).toBe(true);
-
-    parser = new RowParser(row2, scopeUUID, initFormValues, submissionScope, readOnly);
-
-    expect(parser instanceof RowParser).toBe(true);
-
-    parser = new RowParser(row3, scopeUUID, initFormValues, submissionScope, readOnly);
-
-    expect(parser instanceof RowParser).toBe(true);
-
-    parser = new RowParser(row4, scopeUUID, initFormValues, submissionScope, readOnly);
-
-    expect(parser instanceof RowParser).toBe(true);
-
-    parser = new RowParser(row5, scopeUUID, initFormValues, submissionScope, readOnly);
-
-    expect(parser instanceof RowParser).toBe(true);
-
-    parser = new RowParser(row6, scopeUUID, initFormValues, submissionScope, readOnly);
-
-    expect(parser instanceof RowParser).toBe(true);
-
-    parser = new RowParser(row7, scopeUUID, initFormValues, submissionScope, readOnly);
-
-    expect(parser instanceof RowParser).toBe(true);
-
-    parser = new RowParser(row8, scopeUUID, initFormValues, submissionScope, readOnly);
-
-    expect(parser instanceof RowParser).toBe(true);
-
-    parser = new RowParser(row9, scopeUUID, initFormValues, submissionScope, readOnly);
-
-    expect(parser instanceof RowParser).toBe(true);
-
-    parser = new RowParser(row10, scopeUUID, initFormValues, submissionScope, readOnly);
+    const parser = new RowParser(undefined);
 
     expect(parser instanceof RowParser).toBe(true);
   });
 
-  it('should return a DynamicRowGroupModel object', () => {
-    const parser = new RowParser(row1, scopeUUID, initFormValues, submissionScope, readOnly);
+  describe('parse', () => {
+    it('should return a DynamicRowGroupModel object', () => {
+      const parser = new RowParser(undefined);
 
-    const rowModel = parser.parse();
+      const rowModel = parser.parse(submissionId, row1, scopeUUID, initFormValues, submissionScope, readOnly);
 
-    expect(rowModel instanceof DynamicRowGroupModel).toBe(true);
-  });
+      expect(rowModel instanceof DynamicRowGroupModel).toBe(true);
+    });
 
-  it('should return a row with three fields', () => {
-    const parser = new RowParser(row1, scopeUUID, initFormValues, submissionScope, readOnly);
+    it('should return a row with three fields', () => {
+      const parser = new RowParser(undefined);
 
-    const rowModel = parser.parse();
+      const rowModel = parser.parse(submissionId, row1, scopeUUID, initFormValues, submissionScope, readOnly);
 
-    expect((rowModel as DynamicRowGroupModel).group.length).toBe(3);
-  });
+      expect((rowModel as DynamicRowGroupModel).group.length).toBe(3);
+    });
 
-  it('should return a DynamicRowArrayModel object', () => {
-    const parser = new RowParser(row2, scopeUUID, initFormValues, submissionScope, readOnly);
+    it('should return a DynamicRowArrayModel object', () => {
+      const parser = new RowParser(undefined);
 
-    const rowModel = parser.parse();
+      const rowModel = parser.parse(submissionId, row2, scopeUUID, initFormValues, submissionScope, readOnly);
 
-    expect(rowModel instanceof DynamicRowArrayModel).toBe(true);
-  });
+      expect(rowModel instanceof DynamicRowArrayModel).toBe(true);
+    });
 
-  it('should return a row that contains only scoped fields', () => {
-    const parser = new RowParser(row3, scopeUUID, initFormValues, submissionScope, readOnly);
+    it('should return a row that contains only scoped fields', () => {
+      const parser = new RowParser(undefined);
 
-    const rowModel = parser.parse();
+      const rowModel = parser.parse(submissionId, row3, scopeUUID, initFormValues, submissionScope, readOnly);
 
-    expect((rowModel as DynamicRowGroupModel).group.length).toBe(1);
+      expect((rowModel as DynamicRowGroupModel).group.length).toBe(1);
+    });
+
+    it('should be able to parse a dropdown combo field', () => {
+      const parser = new RowParser(undefined);
+
+      const rowModel = parser.parse(submissionId, row4, scopeUUID, initFormValues, submissionScope, readOnly);
+
+      expect(rowModel).toBeDefined();
+    });
+
+    it('should be able to parse a lookup-name field', () => {
+      const parser = new RowParser(undefined);
+
+      const rowModel = parser.parse(submissionId, row5, scopeUUID, initFormValues, submissionScope, readOnly);
+
+      expect(rowModel).toBeDefined();
+    });
+
+    it('should be able to parse a list field', () => {
+      const parser = new RowParser(undefined);
+
+      const rowModel = parser.parse(submissionId, row6, scopeUUID, initFormValues, submissionScope, readOnly);
+
+      expect(rowModel).toBeDefined();
+    });
+
+    it('should be able to parse a date field', () => {
+      const parser = new RowParser(undefined);
+
+      const rowModel = parser.parse(submissionId, row7, scopeUUID, initFormValues, submissionScope, readOnly);
+
+      expect(rowModel).toBeDefined();
+    });
+
+    it('should be able to parse a tag field', () => {
+      const parser = new RowParser(undefined);
+
+      const rowModel = parser.parse(submissionId, row8, scopeUUID, initFormValues, submissionScope, readOnly);
+
+      expect(rowModel).toBeDefined();
+    });
+
+    it('should be able to parse a textarea field', () => {
+      const parser = new RowParser(undefined);
+
+      const rowModel = parser.parse(submissionId, row9, scopeUUID, initFormValues, submissionScope, readOnly);
+
+      expect(rowModel).toBeDefined();
+    });
+
+    it('should be able to parse a group field', () => {
+      const parser = new RowParser(undefined);
+
+      const rowModel = parser.parse(submissionId, row10, scopeUUID, initFormValues, submissionScope, readOnly);
+
+      expect(rowModel).toBeDefined();
+    });
   });
 });
diff --git a/src/app/shared/form/builder/parsers/row-parser.ts b/src/app/shared/form/builder/parsers/row-parser.ts
index 0bb8a0e89a..4938b9859e 100644
--- a/src/app/shared/form/builder/parsers/row-parser.ts
+++ b/src/app/shared/form/builder/parsers/row-parser.ts
@@ -1,30 +1,46 @@
-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';
 
 import { IntegrationSearchOptions } from '../../../../core/integration/models/integration-options.model';
-import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
-import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
 import { isEmpty } from '../../../empty.util';
-import { setLayout } from './parser.utils';
+import { DynamicRowGroupModel } from '../ds-dynamic-form-ui/models/ds-dynamic-row-group-model';
+import { DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP } from '../ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
 import { FormFieldModel } from '../models/form-field.model';
-import { ParserType } from './parser-type';
-import { ParserOptions } from './parser-options';
+import {
+  CONFIG_DATA,
+  FieldParser,
+  INIT_FORM_VALUES,
+  PARSER_OPTIONS,
+  SUBMISSION_ID
+} from './field-parser';
 import { ParserFactory } from './parser-factory';
+import { ParserOptions } from './parser-options';
+import { ParserType } from './parser-type';
+import { setLayout } from './parser.utils';
 
 export const ROW_ID_PREFIX = 'df-row-group-config-';
 
-export class RowParser {
-  protected authorityOptions: IntegrationSearchOptions;
+@Injectable({
+  providedIn: 'root'
+})
 
-  constructor(protected rowData,
-              protected scopeUUID,
-              protected initFormValues: any,
-              protected submissionScope,
-              protected readOnly: boolean) {
-    this.authorityOptions = new IntegrationSearchOptions(scopeUUID);
+/**
+ * Parser the submission data for a single row
+ */
+export class RowParser {
+  constructor(private parentInjector: Injector) {
   }
 
-  public parse(): DynamicRowGroupModel {
+  public parse(submissionId: string,
+               rowData,
+               scopeUUID,
+               initFormValues: any,
+               submissionScope,
+               readOnly: boolean): DynamicRowGroupModel {
     let fieldModel: any = null;
     let parsedResult = null;
     const config: DynamicFormGroupModelConfig = {
@@ -32,31 +48,44 @@ export class RowParser {
       group: [],
     };
 
-    const scopedFields: FormFieldModel[] = this.filterScopedFields(this.rowData.fields);
+    const authorityOptions = new IntegrationSearchOptions(scopeUUID);
+
+    const scopedFields: FormFieldModel[] = this.filterScopedFields(rowData.fields, submissionScope);
 
     const layoutDefaultGridClass = ' col-sm-' + Math.trunc(12 / scopedFields.length);
     const layoutClass = ' d-flex flex-column justify-content-start';
 
     const parserOptions: ParserOptions = {
-      readOnly: this.readOnly,
-      submissionScope: this.submissionScope,
-      authorityUuid: this.authorityOptions.uuid
+      readOnly: readOnly,
+      submissionScope: submissionScope,
+      authorityUuid: authorityOptions.uuid
     };
 
     // Iterate over row's fields
     scopedFields.forEach((fieldData: FormFieldModel) => {
 
       const layoutFieldClass = (fieldData.style || layoutDefaultGridClass) + layoutClass;
-      const parserCo = ParserFactory.getConstructor(fieldData.input.type as ParserType);
-      if (parserCo) {
-        fieldModel = new parserCo(fieldData, this.initFormValues, parserOptions).parse();
+      const parserProvider = ParserFactory.getProvider(fieldData.input.type as ParserType);
+      if (parserProvider) {
+        const fieldInjector = Injector.create({
+          providers: [
+            parserProvider,
+            { provide: SUBMISSION_ID, useValue: submissionId },
+            { provide: CONFIG_DATA, useValue: fieldData },
+            { provide: INIT_FORM_VALUES, useValue: initFormValues },
+            { provide: PARSER_OPTIONS, useValue: parserOptions }
+          ],
+          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) {
         if (fieldModel.type === DYNAMIC_FORM_CONTROL_TYPE_ARRAY || fieldModel.type === DYNAMIC_FORM_CONTROL_TYPE_RELATION_GROUP) {
-          if (this.rowData.fields.length > 1) {
+          if (rowData.fields.length > 1) {
             setLayout(fieldModel, 'grid', 'host', layoutFieldClass);
             config.group.push(fieldModel);
             // if (isEmpty(parsedResult)) {
@@ -98,15 +127,15 @@ export class RowParser {
     return parsedResult;
   }
 
-  checksFieldScope(fieldScope) {
-    return (isEmpty(fieldScope) || isEmpty(this.submissionScope) || fieldScope === this.submissionScope);
+  checksFieldScope(fieldScope, submissionScope) {
+    return (isEmpty(fieldScope) || isEmpty(submissionScope) || fieldScope === submissionScope);
   }
 
-  filterScopedFields(fields: FormFieldModel[]): FormFieldModel[] {
+  filterScopedFields(fields: FormFieldModel[], submissionScope): FormFieldModel[] {
     const filteredFields: FormFieldModel[] = [];
     fields.forEach((field: FormFieldModel) => {
       // Whether field scope doesn't match the submission scope, skip it
-      if (this.checksFieldScope(field.scope)) {
+      if (this.checksFieldScope(field.scope, submissionScope)) {
         filteredFields.push(field);
       }
     });
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 95351d027f..ceb4e96320 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
@@ -8,6 +8,7 @@ describe('SeriesFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
 
+  const submissionId = '1234';
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
@@ -32,13 +33,13 @@ describe('SeriesFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new SeriesFieldParser(field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(parser instanceof SeriesFieldParser).toBe(true);
   });
 
   it('should return a DynamicConcatModel object when repeatable option is false', () => {
-    const parser = new SeriesFieldParser(field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -46,7 +47,7 @@ describe('SeriesFieldParser test suite', () => {
   });
 
   it('should return a DynamicConcatModel object with the correct separator', () => {
-    const parser = new SeriesFieldParser(field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -59,7 +60,7 @@ describe('SeriesFieldParser test suite', () => {
     };
     const expectedValue = new FormFieldMetadataValueObject('test; series');
 
-    const parser = new SeriesFieldParser(field, initFormValues, parserOptions);
+    const parser = new SeriesFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
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 9857b4e993..36ee9c36c1 100644
--- a/src/app/shared/form/builder/parsers/series-field-parser.ts
+++ b/src/app/shared/form/builder/parsers/series-field-parser.ts
@@ -1,10 +1,17 @@
+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 { ParserOptions } from './parser-options';
 
 export class SeriesFieldParser extends ConcatFieldParser {
 
-  constructor(protected configData: FormFieldModel, protected initFormValues, protected parserOptions: ParserOptions) {
-    super(configData, initFormValues, parserOptions, ';');
+  constructor(
+    @Inject(SUBMISSION_ID) submissionId: string,
+    @Inject(CONFIG_DATA) configData: FormFieldModel,
+    @Inject(INIT_FORM_VALUES) initFormValues,
+    @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 3051dc6395..90449e62e5 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
@@ -8,6 +8,7 @@ describe('TagFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
 
+  const submissionId = '1234';
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: 'testScopeUUID',
@@ -36,13 +37,13 @@ describe('TagFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new TagFieldParser(field, initFormValues, parserOptions);
+    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(parser instanceof TagFieldParser).toBe(true);
   });
 
   it('should return a DynamicTagModel object when repeatable option is false', () => {
-    const parser = new TagFieldParser(field, initFormValues, parserOptions);
+    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -57,7 +58,7 @@ describe('TagFieldParser test suite', () => {
       ],
     };
 
-    const parser = new TagFieldParser(field, initFormValues, parserOptions);
+    const parser = new TagFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
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 c26d758e48..167f126cf2 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
@@ -8,6 +8,7 @@ describe('TextareaFieldParser test suite', () => {
   let field: FormFieldModel;
   let initFormValues: any = {};
 
+  const submissionId = '1234';
   const parserOptions: ParserOptions = {
     readOnly: false,
     submissionScope: null,
@@ -34,13 +35,13 @@ describe('TextareaFieldParser test suite', () => {
   });
 
   it('should init parser properly', () => {
-    const parser = new TextareaFieldParser(field, initFormValues, parserOptions);
+    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions);
 
     expect(parser instanceof TextareaFieldParser).toBe(true);
   });
 
   it('should return a DsDynamicTextAreaModel object when repeatable option is false', () => {
-    const parser = new TextareaFieldParser(field, initFormValues, parserOptions);
+    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
@@ -55,7 +56,7 @@ describe('TextareaFieldParser test suite', () => {
     };
     const expectedValue ='test description';
 
-    const parser = new TextareaFieldParser(field, initFormValues, parserOptions);
+    const parser = new TextareaFieldParser(submissionId, field, initFormValues, parserOptions);
 
     const fieldModel = parser.parse();
 
diff --git a/src/app/shared/form/form.component.html b/src/app/shared/form/form.component.html
index 21d4a81659..510bf7291b 100644
--- a/src/app/shared/form/form.component.html
+++ b/src/app/shared/form/form.component.html
@@ -13,10 +13,10 @@
 
       <ng-template modelType="ARRAY" let-group let-index="index" let-context="context">
 
-        <!--Array with repeteable items-->
+        <!--Array with repeatable items-->
         <div *ngIf="!context.notRepeatable"
              class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="group" aria-label="Basic example">
+          <div class="btn-group" role="group" aria-label="Add and remove button">
             <button type="button" class="btn btn-secondary"
                     [disabled]="isItemReadOnly(context, index)"
                     (click)="insertItem($event, group.context, group.index + 1)">
@@ -30,10 +30,10 @@
           </div>
         </div>
 
-        <!--Array with non repeteable items - Only delete button-->
+        <!--Array with non repeatable items - Only delete button-->
         <div *ngIf="context.notRepeatable && group.context.groups.length > 1"
              class="col-xs-2 d-flex flex-column justify-content-sm-start align-items-end">
-          <div class="btn-group" role="group" aria-label="Basic example">
+          <div class="btn-group" role="group" aria-label="Remove button">
             <button type="button" class="btn btn-secondary"
                     (click)="removeItem($event, context, index)"
                     [disabled]="group.context.groups.length === 1 || isItemReadOnly(context, index)">
diff --git a/src/app/shared/form/form.component.spec.ts b/src/app/shared/form/form.component.spec.ts
index 669c416eb9..3342db37ae 100644
--- a/src/app/shared/form/form.component.spec.ts
+++ b/src/app/shared/form/form.component.spec.ts
@@ -381,8 +381,8 @@ describe('FormComponent test suite', () => {
   });
 
   describe('', () => {
+    init();
     beforeEach(() => {
-
       formFixture = TestBed.createComponent(FormComponent);
       store = TestBed.get(Store);
       formComp = formFixture.componentInstance; // FormComponent test instance
diff --git a/src/app/shared/history/selectors.ts b/src/app/shared/history/selectors.ts
deleted file mode 100644
index 07af6a2dde..0000000000
--- a/src/app/shared/history/selectors.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-import { AppState } from '../../app.reducer';
-
-export const historySelector = (state: AppState) => state.history;
diff --git a/src/app/shared/host-window.reducer.spec.ts b/src/app/shared/host-window.reducer.spec.ts
index fa013b0f10..f0e7aa7245 100644
--- a/src/app/shared/host-window.reducer.spec.ts
+++ b/src/app/shared/host-window.reducer.spec.ts
@@ -1,5 +1,5 @@
 import * as deepFreeze from 'deep-freeze';
-import { hostWindowReducer } from './host-window.reducer';
+import { hostWindowReducer } from './search/host-window.reducer';
 import { HostWindowResizeAction } from './host-window.actions';
 
 class NullAction extends HostWindowResizeAction {
diff --git a/src/app/shared/host-window.service.ts b/src/app/shared/host-window.service.ts
index 146c616e38..f556c7b7bd 100644
--- a/src/app/shared/host-window.service.ts
+++ b/src/app/shared/host-window.service.ts
@@ -1,7 +1,7 @@
 import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 
 import { filter, distinctUntilChanged, map } from 'rxjs/operators';
-import { HostWindowState } from './host-window.reducer';
+import { HostWindowState } from './search/host-window.reducer';
 import { Injectable } from '@angular/core';
 import { createSelector, select, Store } from '@ngrx/store';
 
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 1f16a84b2c..f6cc646d5a 100644
--- a/src/app/shared/input-suggestions/input-suggestions.component.spec.ts
+++ b/src/app/shared/input-suggestions/input-suggestions.component.spec.ts
@@ -14,9 +14,11 @@ describe('InputSuggestionsComponent', () => {
   let fixture: ComponentFixture<InputSuggestionsComponent>;
   let de: DebugElement;
   let el: HTMLElement;
-  const suggestions = [{displayValue: 'suggestion uno', value: 'suggestion uno'}, {displayValue: 'suggestion dos', value: 'suggestion dos'}, {displayValue: 'suggestion tres', value: 'suggestion tres'}];
+  let suggestions;
 
   beforeEach(async(() => {
+    suggestions = [{displayValue: 'suggestion uno', value: 'suggestion uno'}, {displayValue: 'suggestion dos', value: 'suggestion dos'}, {displayValue: 'suggestion tres', value: 'suggestion tres'}];
+
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([]), NoopAnimationsModule, FormsModule],
       declarations: [InputSuggestionsComponent],
@@ -279,6 +281,7 @@ describe('InputSuggestionsComponent', () => {
       expect(autocomplete.nativeElement.classList).not.toContain('show');
     });
   });
+
   describe('when the variable \'show\' is set to true and close() is called', () => {
     beforeEach(() => {
       comp.show.next(true);
@@ -302,5 +305,4 @@ describe('InputSuggestionsComponent', () => {
       expect(comp.onClickSuggestion).toHaveBeenCalledWith(suggestions[clickedIndex].value);
     });
   });
-
 });
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 5b10578f77..3d7aca46b6 100644
--- a/src/app/shared/lang-switch/lang-switch.component.spec.ts
+++ b/src/app/shared/lang-switch/lang-switch.component.spec.ts
@@ -78,7 +78,7 @@ describe('LangSwitchComponent', () => {
       }).compileComponents()
         .then(() => {
           translate = TestBed.get(TranslateService);
-          translate.addLangs(mockConfig.languages.filter((langConfig:LangConfig) => langConfig.active === true).map((a) => a.code));
+          translate.addLangs(mockConfig.languages.filter((langConfig: LangConfig) => langConfig.active === true).map((a) => a.code));
           translate.setDefaultLang('en');
           translate.use('en');
           http = TestBed.get(HttpTestingController);
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 f24ca86661..199bbeae25 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
@@ -10,15 +10,23 @@ describe('LinkMenuItemComponent', () => {
   let component: LinkMenuItemComponent;
   let fixture: ComponentFixture<LinkMenuItemComponent>;
   let debugElement: DebugElement;
-  const text = 'HELLO';
-  const link = 'http://google.com';
-  const nameSpace = 'dspace.com/';
-  const globalConfig = {
-    ui: {
-      nameSpace: nameSpace
-    }
-  } as any;
+  let text;
+  let link;
+  let nameSpace;
+  let globalConfig;
+
+  function init() {
+    text = 'HELLO';
+    link = 'http://google.com';
+    nameSpace = 'dspace.com/';
+    globalConfig = {
+      ui: {
+        nameSpace: nameSpace
+      }
+    } as any;
+  }
   beforeEach(async(() => {
+    init();
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot()],
       declarations: [LinkMenuItemComponent, RouterLinkDirectiveStub],
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 ebb099fb56..0a72d17eca 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
@@ -13,13 +13,14 @@ describe('MenuSectionComponent', () => {
   let comp: MenuSectionComponent;
   let fixture: ComponentFixture<MenuSectionComponent>;
   let menuService: MenuService;
-  const dummySection = {
-    id: 'section',
-    visible: true,
-    active: false
-  } as any;
+  let dummySection;
 
   beforeEach(async(() => {
+    dummySection = {
+      id: 'section',
+      visible: true,
+      active: false
+    } as any;
     TestBed.configureTestingModule({
       imports: [TranslateModule.forRoot(), NoopAnimationsModule],
       declarations: [MenuSectionComponent],
diff --git a/src/app/shared/menu/menu.service.spec.ts b/src/app/shared/menu/menu.service.spec.ts
index b7f955b257..0386e5a4d5 100644
--- a/src/app/shared/menu/menu.service.spec.ts
+++ b/src/app/shared/menu/menu.service.spec.ts
@@ -1,83 +1,106 @@
-import * as ngrx from '@ngrx/store';
-import { Store } from '@ngrx/store';
 import { async, TestBed } from '@angular/core/testing';
-import { MenuService } from './menu.service';
-import { cold, hot } from 'jasmine-marbles';
-import { MenuID } from './initial-menus-state';
+
 import { of as observableOf } from 'rxjs';
+import * as ngrx from '@ngrx/store';
+import { Store, StoreModule } from '@ngrx/store';
+import { provideMockStore } from '@ngrx/store/testing';
+import { cold, hot } from 'jasmine-marbles';
+
+import { MenuService } from './menu.service';
+import { MenuID } from './initial-menus-state';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
-  CollapseMenuAction, CollapseMenuPreviewAction, DeactivateMenuSectionAction,
-  ExpandMenuAction, ExpandMenuPreviewAction, HideMenuAction,
-  RemoveMenuSectionAction, ShowMenuAction, ToggleActiveMenuSectionAction, ToggleMenuAction
+  CollapseMenuAction,
+  CollapseMenuPreviewAction,
+  DeactivateMenuSectionAction,
+  ExpandMenuAction,
+  ExpandMenuPreviewAction,
+  HideMenuAction,
+  RemoveMenuSectionAction,
+  ShowMenuAction,
+  ToggleActiveMenuSectionAction,
+  ToggleMenuAction
 } from './menu.actions';
+import { MenuSection, menusReducer } from './menu.reducer';
 
 describe('MenuService', () => {
   let service: MenuService;
   let selectSpy;
-  const store = Object.assign(observableOf({}), {
-    dispatch: () => {/***/
-    }
-  }) as any;
-  const fakeMenu = {
-    id: MenuID.ADMIN,
-    collapsed: true,
-    visible: false,
-    previewCollapsed: true
-  } as any;
-  const visibleSection1 = {
-    id: 'section',
-    visible: true,
-    active: false
-  };
-  const visibleSection2 = {
-    id: 'section_2',
-    visible: true
-  };
-  const hiddenSection3 = {
-    id: 'section_3',
-    visible: false
-  };
-  const subSection4 = {
-    id: 'section_4',
-    visible: true,
-    parentID: 'section1'
-  };
+  let store: any;
+  let fakeMenu;
+  let visibleSection1;
+  let visibleSection2;
+  let hiddenSection3;
+  let subSection4;
+  let topSections;
+  let initialState;
 
-  const topSections = {
-    section: visibleSection1,
-    section_2: visibleSection2,
-    section_3: hiddenSection3,
-    section_4: subSection4
-  };
+  function init() {
+
+    visibleSection1 = {
+      id: 'section',
+      visible: true,
+      active: false
+    };
+    visibleSection2 = {
+      id: 'section_2',
+      visible: true
+    };
+    hiddenSection3 = {
+      id: 'section_3',
+      visible: false
+    };
+    subSection4 = {
+      id: 'section_4',
+      visible: true,
+      parentID: 'section1'
+    };
+
+    topSections = {
+      section: visibleSection1,
+      section_2: visibleSection2,
+      section_3: hiddenSection3,
+      section_4: subSection4
+    };
+
+    fakeMenu = {
+      id: MenuID.ADMIN,
+      collapsed: true,
+      visible: false,
+      sections: topSections,
+      previewCollapsed: true
+    } as any;
+
+    initialState = {
+      menus: {
+        'admin-sidebar' : fakeMenu
+      }
+    };
+
+  }
 
   beforeEach(async(() => {
+    init();
     TestBed.configureTestingModule({
+      imports: [
+        StoreModule.forRoot({ menus: menusReducer })
+      ],
       providers: [
-        { provide: Store, useValue: store },
+        provideMockStore({ initialState }),
         { provide: MenuService, useValue: service }
       ]
     }).compileComponents();
   }));
 
   beforeEach(() => {
+    store = TestBed.get(Store);
     service = new MenuService(store);
-    selectSpy = spyOnProperty(ngrx, 'select');
+    selectSpy = spyOnProperty(ngrx, 'select').and.callThrough();
     spyOn(store, 'dispatch');
   });
 
   describe('getMenu', () => {
-    beforeEach(() => {
-      selectSpy.and.callFake(() => {
-        return () => {
-          return () => hot('a', {
-              a: fakeMenu
-            }
-          );
-        };
-      });
-    });
     it('should return the menu', () => {
 
       const result = service.getMenu(MenuID.ADMIN);
@@ -125,7 +148,7 @@ describe('MenuService', () => {
     describe('when the subsection list is not empty', () => {
 
       beforeEach(() => {
-        spyOn(service, 'getMenuSection').and.returnValue(observableOf(visibleSection1));
+        spyOn(service, 'getMenuSection').and.returnValue(observableOf(visibleSection1 as MenuSection));
         selectSpy.and.callFake(() => {
           return () => {
             return () => hot('a', {
@@ -214,25 +237,25 @@ describe('MenuService', () => {
   });
 
   describe('getMenuSection', () => {
-    beforeEach(() => {
-      selectSpy.and.callFake(() => {
-        return () => {
-          return () => hot('a', {
-              a: hiddenSection3
-            }
-          );
-        };
-      });
-    });
-    it('should return false', () => {
+    it('should return menu section', () => {
 
-      const result = service.getMenuSection(MenuID.ADMIN, 'fakeId');
+      const result = service.getMenuSection(MenuID.ADMIN, 'section_3');
       const expected = cold('b', {
         b: hiddenSection3
       });
 
       expect(result).toBeObservable(expected);
     });
+
+    it('should return undefined', () => {
+
+      const result = service.getMenuSection(MenuID.ADMIN, 'fake');
+      const expected = cold('b', {
+        b: undefined
+      });
+
+      expect(result).toBeObservable(expected);
+    });
   });
 
   describe('isMenuCollapsed', () => {
@@ -283,7 +306,7 @@ describe('MenuService', () => {
 
   describe('isSectionActive', () => {
     beforeEach(() => {
-      spyOn(service, 'getMenuSection').and.returnValue(observableOf(visibleSection1));
+      spyOn(service, 'getMenuSection').and.returnValue(observableOf(visibleSection1 as MenuSection));
     });
 
     it('should return false when the section is not active', () => {
@@ -298,7 +321,7 @@ describe('MenuService', () => {
 
   describe('isSectionVisible', () => {
     beforeEach(() => {
-      spyOn(service, 'getMenuSection').and.returnValue(observableOf(hiddenSection3));
+      spyOn(service, 'getMenuSection').and.returnValue(observableOf(hiddenSection3 as MenuSection));
     });
 
     it('should return false when the section is hidden', () => {
diff --git a/src/app/shared/menu/menu.service.ts b/src/app/shared/menu/menu.service.ts
index 067de57aae..95611daa21 100644
--- a/src/app/shared/menu/menu.service.ts
+++ b/src/app/shared/menu/menu.service.ts
@@ -1,24 +1,35 @@
 import { Injectable } from '@angular/core';
-import { MemoizedSelector, select, Store } from '@ngrx/store';
-import { MenuSection, MenuSectionIndex, MenuSections, MenusState, MenuState } from './menu.reducer';
+import { createSelector, MemoizedSelector, select, Store } from '@ngrx/store';
+import { MenuSection, MenuSections, MenuState } from './menu.reducer';
 import { AppState, keySelector } from '../../app.reducer';
 import { MenuID } from './initial-menus-state';
-import { Observable } from 'rxjs';
+import { combineLatest as observableCombineLatest, Observable } from 'rxjs';
 import { map, switchMap } from 'rxjs/operators';
 import {
   ActivateMenuSectionAction,
   AddMenuSectionAction,
-  CollapseMenuAction, CollapseMenuPreviewAction,
+  CollapseMenuAction,
+  CollapseMenuPreviewAction,
   DeactivateMenuSectionAction,
-  ExpandMenuAction, ExpandMenuPreviewAction,
+  ExpandMenuAction,
+  ExpandMenuPreviewAction,
   HideMenuAction,
   RemoveMenuSectionAction,
   ShowMenuAction,
   ToggleActiveMenuSectionAction,
   ToggleMenuAction,
 } from './menu.actions';
-import { hasNoValue, isNotEmpty } from '../empty.util';
-import { combineLatest as observableCombineLatest } from 'rxjs';
+import { hasNoValue, hasValue, isNotEmpty } from '../empty.util';
+
+export function menuKeySelector<T>(key: string, selector): MemoizedSelector<MenuState, T> {
+  return createSelector(selector, (state) => {
+    if (hasValue(state)) {
+      return state[key];
+    } else {
+      return undefined;
+    }
+  });
+}
 
 const menusStateSelector = (state) => state.menus;
 
@@ -28,20 +39,20 @@ const menuByIDSelector = (menuID: MenuID): MemoizedSelector<AppState, MenuState>
 
 const menuSectionStateSelector = (state: MenuState) => state.sections;
 
-const menuSectionByIDSelector = (id: string): MemoizedSelector<AppState, MenuSection> => {
-  return keySelector<MenuSection>(id, menuSectionStateSelector);
+const menuSectionByIDSelector = (id: string): MemoizedSelector<MenuState, MenuSection> => {
+  return menuKeySelector<MenuSection>(id, menuSectionStateSelector);
 };
 
 const menuSectionIndexStateSelector = (state: MenuState) => state.sectionToSubsectionIndex;
 
-const getSubSectionsFromSectionSelector = (id: string): MemoizedSelector<AppState, MenuSectionIndex> => {
-  return keySelector<MenuSectionIndex>(id, menuSectionIndexStateSelector);
+const getSubSectionsFromSectionSelector = (id: string): MemoizedSelector<MenuState, string[]> => {
+  return menuKeySelector<string[]>(id, menuSectionIndexStateSelector);
 };
 
 @Injectable()
 export class MenuService {
 
-  constructor(private store: Store<MenusState>) {
+  constructor(private store: Store<AppState>) {
   }
 
   /**
diff --git a/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.spec.ts b/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.spec.ts
new file mode 100644
index 0000000000..e0dae08470
--- /dev/null
+++ b/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.spec.ts
@@ -0,0 +1,75 @@
+import { HttpHeaders, HttpResponse } from '@angular/common/http';
+import { of as observableOf } from 'rxjs';
+import { GlobalConfig } from '../../../../config/global-config.interface';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
+import { EndpointMockingRestService } from './endpoint-mocking-rest.service';
+import { MockResponseMap } from './mocks/mock-response-map';
+
+describe('EndpointMockingRestService', () => {
+  let service: EndpointMockingRestService;
+
+  const serverHttpResponse: HttpResponse<any> = {
+    body: { bar: false },
+    headers: new HttpHeaders(),
+    statusText: '200'
+  } as HttpResponse<any>;
+
+  const mockResponseMap: MockResponseMap = new Map([
+    [ '/foo', { bar: true } ]
+  ]);
+
+  beforeEach(() => {
+    const EnvConfig = {
+      rest: {
+        nameSpace: '/api'
+      }
+    } as GlobalConfig;
+
+    const httpStub = jasmine.createSpyObj('http', {
+      get: observableOf(serverHttpResponse),
+      request: observableOf(serverHttpResponse)
+    });
+
+    service = new EndpointMockingRestService(EnvConfig, mockResponseMap, httpStub);
+  });
+
+  describe('get', () => {
+    describe('when the URL is mocked', () => {
+      it('should return the mock data', (done) => {
+        service.get('https://rest.com/api/foo').subscribe((response) => {
+          expect(response.payload).toEqual({ bar: true });
+          done();
+        });
+      });
+    });
+
+    describe('when the URL isn\'t mocked', () => {
+      it('should return the server data', (done) => {
+        service.get('https://rest.com/api').subscribe((response) => {
+          expect(response.payload).toEqual({ bar: false });
+          done();
+        });
+      });
+    });
+  });
+
+  describe('request', () => {
+    describe('when the URL is mocked', () => {
+      it('should return the mock data', (done) => {
+        service.request(RestRequestMethod.GET, 'https://rest.com/api/foo').subscribe((response) => {
+          expect(response.payload).toEqual({ bar: true });
+          done();
+        });
+      });
+    });
+
+    describe('when the URL isn\'t mocked', () => {
+      it('should return the server data', (done) => {
+        service.request(RestRequestMethod.GET, 'https://rest.com/api').subscribe((response) => {
+          expect(response.payload).toEqual({ bar: false });
+          done();
+        });
+      });
+    });
+  });
+});
diff --git a/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.ts b/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.ts
new file mode 100644
index 0000000000..b0e89b80b5
--- /dev/null
+++ b/src/app/shared/mocks/dspace-rest-v2/endpoint-mocking-rest.service.ts
@@ -0,0 +1,111 @@
+import { HttpClient, HttpHeaders } from '@angular/common/http'
+import { Inject, Injectable } from '@angular/core';
+import { Observable, of as observableOf } from 'rxjs';
+import { GLOBAL_CONFIG, GlobalConfig } from '../../../../config';
+import { isEmpty } from '../../empty.util';
+import { RestRequestMethod } from '../../../core/data/rest-request-method';
+
+import { DSpaceRESTV2Response } from '../../../core/dspace-rest-v2/dspace-rest-v2-response.model';
+import { DSpaceRESTv2Service, HttpOptions } from '../../../core/dspace-rest-v2/dspace-rest-v2.service';
+import { MOCK_RESPONSE_MAP, MockResponseMap } from './mocks/mock-response-map';
+import * as URL from 'url-parse';
+
+/**
+ * Service to access DSpace's REST API.
+ *
+ * If a URL is found in this.mockResponseMap, it returns the mock response instead
+ * This service can be used for mocking REST responses when developing new features
+ * This is especially useful, when a REST endpoint is broken or does not exist yet
+ */
+@Injectable()
+export class EndpointMockingRestService extends DSpaceRESTv2Service {
+
+  constructor(
+    @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
+    @Inject(MOCK_RESPONSE_MAP) protected mockResponseMap: MockResponseMap,
+    protected http: HttpClient
+  ) {
+    super(http);
+  }
+
+  /**
+   * Performs a request to the REST API with the `get` http method.
+   *
+   * If the URL is found in this.mockResponseMap,
+   * it returns the mock response instead
+   *
+   * @param absoluteURL
+   *      A URL
+   * @return Observable<DSpaceRESTV2Response>
+   *      An Observable<DSpaceRESTV2Response> containing the response
+   */
+  get(absoluteURL: string): Observable<DSpaceRESTV2Response> {
+    const mockData = this.getMockData(absoluteURL);
+    if (isEmpty(mockData)) {
+      return super.get(absoluteURL);
+    } else {
+      return this.toMockResponse$(mockData);
+    }
+  }
+
+  /**
+   * Performs a request to the REST API.
+   *
+   * If the URL is found in this.mockResponseMap,
+   * it returns the mock response instead
+   *
+   * @param method
+   *    the HTTP method for the request
+   * @param url
+   *    the URL for the request
+   * @param body
+   *    an optional body for the request
+   * @return Observable<DSpaceRESTV2Response>
+   *      An Observable<DSpaceRESTV2Response> containing the response from the server
+   */
+  request(method: RestRequestMethod, url: string, body?: any, options?: HttpOptions): Observable<DSpaceRESTV2Response> {
+    const mockData = this.getMockData(url);
+    if (isEmpty(mockData)) {
+      return super.request(method, url, body, options);
+    } else {
+      return this.toMockResponse$(mockData);
+    }
+  }
+
+  /**
+   * Turn the mock object in to an Observable<DSpaceRESTV2Response>
+   *
+   * @param mockData
+   *    the mock response
+   * @return
+   *    an Observable<DSpaceRESTV2Response> containing the mock response
+   */
+  private toMockResponse$(mockData: any): Observable<DSpaceRESTV2Response> {
+    return observableOf({
+      payload: mockData,
+      headers: new HttpHeaders(),
+      statusCode: 200,
+      statusText: 'OK'
+    });
+  }
+
+  /**
+   * Get the mock response associated with this URL from this.mockResponseMap
+   *
+   * @param urlStr
+   *    the URL to fetch a mock reponse for
+   * @return any
+   *    the mock response if there is one, undefined otherwise
+   */
+  private getMockData(urlStr: string): any {
+    const url = new URL(urlStr);
+    const key = url.pathname.slice(this.EnvConfig.rest.nameSpace.length);
+    if (this.mockResponseMap.has(key)) {
+      // parse and stringify to clone the object to ensure that any changes made
+      // to it afterwards don't affect future calls
+      return JSON.parse(JSON.stringify(this.mockResponseMap.get(key)));
+    } else {
+      return undefined;
+    }
+  }
+}
diff --git a/src/app/shared/mocks/dspace-rest-v2/mocks/mock-response-map.ts b/src/app/shared/mocks/dspace-rest-v2/mocks/mock-response-map.ts
new file mode 100644
index 0000000000..a7fab782da
--- /dev/null
+++ b/src/app/shared/mocks/dspace-rest-v2/mocks/mock-response-map.ts
@@ -0,0 +1,15 @@
+import { InjectionToken } from '@angular/core';
+import mockSubmissionResponse from './mock-submission-response.json';
+
+export class MockResponseMap extends Map<string, any> {};
+
+export const MOCK_RESPONSE_MAP: InjectionToken<MockResponseMap> = new InjectionToken<MockResponseMap>('mockResponseMap');
+
+/**
+ * List of endpoints with their matching mock response
+ * Note that this list is only used in development mode
+ * In production the actual endpoints on the REST server will be called
+ */
+export const mockResponseMap: MockResponseMap = new Map([
+  // [ '/config/submissionforms/traditionalpageone', mockSubmissionResponse ]
+]);
diff --git a/src/app/shared/mocks/dspace-rest-v2/mocks/mock-submission-response.json b/src/app/shared/mocks/dspace-rest-v2/mocks/mock-submission-response.json
new file mode 100644
index 0000000000..3c7860102f
--- /dev/null
+++ b/src/app/shared/mocks/dspace-rest-v2/mocks/mock-submission-response.json
@@ -0,0 +1,266 @@
+{
+  "id": "traditionalpageone",
+  "name": "traditionalpageone",
+  "rows": [
+    {
+      "fields": [
+        {
+          "input": {},
+          "label": "Journal",
+          "mandatory": false,
+          "repeatable": false,
+          "hints": "Select the journal related to this volume.",
+          "selectableRelationship": {
+            "relationshipType": "isVolumeOfJournal",
+            "filter": "creativework.publisher:somepublishername",
+            "searchConfiguration": "periodicalConfiguration"
+          },
+          "languageCodes": []
+        }
+      ]
+    },
+    {
+      "fields": [
+        {
+          "input": {
+            "type": "onebox"
+          },
+          "label": "Title",
+          "mandatory": true,
+          "repeatable": false,
+          "mandatoryMessage": "You must enter a main title for this item.",
+          "hints": "Enter the main title of the item.",
+          "selectableMetadata": [
+            {
+              "metadata": "dc.title",
+              "label": null,
+              "authority": null,
+              "closed": null
+            }
+          ],
+          "languageCodes": [
+            "en",
+            "nl"
+          ]
+        }
+      ]
+    },
+    {
+      "fields": [
+        {
+          "input": {
+            "type": "onebox"
+          },
+          "label": "Other Titles",
+          "mandatory": false,
+          "repeatable": true,
+          "hints": "If the item has any alternative titles, please enter them here.",
+          "selectableMetadata": [
+            {
+              "metadata": "dc.title.alternative",
+              "label": null,
+              "authority": null,
+              "closed": null
+            }
+          ],
+          "languageCodes": []
+        }
+      ]
+    },
+    {
+      "fields": [
+        {
+          "input": {
+            "type": "date"
+          },
+          "label": "Date of Issue",
+          "mandatory": true,
+          "repeatable": false,
+          "mandatoryMessage": "You must enter at least the year.",
+          "hints": "Please give the date of previous publication or public distribution.\n                        You can leave out the day and/or month if they aren't\n                        applicable.",
+          "style": "col-sm-4",
+          "selectableMetadata": [
+            {
+              "metadata": "dc.date.issued",
+              "label": null,
+              "authority": null,
+              "closed": null
+            }
+          ],
+          "languageCodes": []
+        },
+        {
+          "input": {
+            "type": "onebox"
+          },
+          "label": "Publisher",
+          "mandatory": false,
+          "repeatable": false,
+          "hints": "Enter the name of the publisher of the previously issued instance of this item.",
+          "style": "col-sm-8",
+          "selectableMetadata": [
+            {
+              "metadata": "dc.publisher",
+              "label": null,
+              "authority": null,
+              "closed": null
+            }
+          ],
+          "languageCodes": []
+        }
+      ]
+    },
+    {
+      "fields": [
+        {
+          "input": {
+            "type": "onebox"
+          },
+          "label": "Citation",
+          "mandatory": false,
+          "repeatable": false,
+          "hints": "Enter the standard citation for the previously issued instance of this item.",
+          "selectableMetadata": [
+            {
+              "metadata": "dc.identifier.citation",
+              "label": null,
+              "authority": null,
+              "closed": null
+            }
+          ],
+          "languageCodes": []
+        }
+      ]
+    },
+    {
+      "fields": [
+        {
+          "input": {
+            "type": "series"
+          },
+          "label": "Series/Report No.",
+          "mandatory": false,
+          "repeatable": true,
+          "hints": "Enter the series and number assigned to this item by your community.",
+          "selectableMetadata": [
+            {
+              "metadata": "dc.relation.ispartofseries",
+              "label": null,
+              "authority": null,
+              "closed": null
+            }
+          ],
+          "languageCodes": []
+        }
+      ]
+    },
+    {
+      "fields": [
+        {
+          "input": {
+            "type": "onebox"
+          },
+          "label": "Identifiers",
+          "mandatory": false,
+          "repeatable": true,
+          "hints": "If the item has any identification numbers or codes associated with\nit, please enter the types and the actual numbers or codes.",
+          "selectableMetadata": [
+            {
+              "metadata": "dc.identifier.issn",
+              "label": "ISSN",
+              "authority": null,
+              "closed": null
+            },
+            {
+              "metadata": "dc.identifier.other",
+              "label": "Other",
+              "authority": null,
+              "closed": null
+            },
+            {
+              "metadata": "dc.identifier.ismn",
+              "label": "ISMN",
+              "authority": null,
+              "closed": null
+            },
+            {
+              "metadata": "dc.identifier.govdoc",
+              "label": "Gov't Doc #",
+              "authority": null,
+              "closed": null
+            },
+            {
+              "metadata": "dc.identifier.uri",
+              "label": "URI",
+              "authority": null,
+              "closed": null
+            },
+            {
+              "metadata": "dc.identifier.isbn",
+              "label": "ISBN",
+              "authority": null,
+              "closed": null
+            },
+            {
+              "metadata": "dc.identifier.doi",
+              "label": "DOI",
+              "authority": null,
+              "closed": null
+            }
+          ],
+          "languageCodes": []
+        }
+      ]
+    },
+    {
+      "fields": [
+        {
+          "input": {
+            "type": "dropdown"
+          },
+          "label": "Type",
+          "mandatory": false,
+          "repeatable": true,
+          "hints": "Select the type(s) of content of the item. To select more than one value in the list, you may have to hold down the \"CTRL\" or \"Shift\" key.",
+          "selectableMetadata": [
+            {
+              "metadata": "dc.type",
+              "label": null,
+              "authority": "common_types",
+              "closed": false
+            }
+          ],
+          "languageCodes": []
+        }
+      ]
+    },
+    {
+      "fields": [
+        {
+          "input": {
+            "type": "dropdown"
+          },
+          "label": "Language",
+          "mandatory": false,
+          "repeatable": false,
+          "hints": "Select the language of the main content of the item.  If the language does not appear in the list, please select 'Other'.  If the content does not really have a language (for example, if it is a dataset or an image) please select 'N/A'.",
+          "selectableMetadata": [
+            {
+              "metadata": "dc.language.iso",
+              "label": null,
+              "authority": "common_iso_languages",
+              "closed": false
+            }
+          ],
+          "languageCodes": []
+        }
+      ]
+    }
+  ],
+  "type": "submissionform",
+  "_links": {
+    "self": {
+      "href": "https://dspace7.4science.cloud/dspace-spring-rest/api/core/config/submissionforms/traditionalpageone"
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/app/shared/mocks/mock-angulartics.service.ts b/src/app/shared/mocks/mock-angulartics.service.ts
index 99a8b96b22..a7516eb44a 100644
--- a/src/app/shared/mocks/mock-angulartics.service.ts
+++ b/src/app/shared/mocks/mock-angulartics.service.ts
@@ -1,4 +1,5 @@
 /* tslint:disable:no-empty */
 export class AngularticsMock {
   public eventTrack(action, properties) { }
+  public startTracking(): void {}
 }
diff --git a/src/app/shared/mocks/mock-auth.service.ts b/src/app/shared/mocks/mock-auth.service.ts
index 6258e4aa21..a168ffd8e5 100644
--- a/src/app/shared/mocks/mock-auth.service.ts
+++ b/src/app/shared/mocks/mock-auth.service.ts
@@ -3,4 +3,7 @@ export class AuthServiceMock {
   public checksAuthenticationToken() {
     return
   }
+  public buildAuthHeader() {
+    return 'auth-header';
+  }
 }
diff --git a/src/app/shared/mocks/mock-form-models.ts b/src/app/shared/mocks/mock-form-models.ts
index f2fc38c420..e4f9ec3131 100644
--- a/src/app/shared/mocks/mock-form-models.ts
+++ b/src/app/shared/mocks/mock-form-models.ts
@@ -1,9 +1,6 @@
 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
-} from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
+import { DynamicRowArrayModel, DynamicRowArrayModelConfig } from '../form/builder/ds-dynamic-form-ui/models/ds-dynamic-row-array-model';
 import { DynamicSelectModel } from '@ng-dynamic-forms/core';
 import { SubmissionScopeType } from '../../core/submission/submission-scope-type';
 import { DynamicRelationGroupModel } from '../form/builder/ds-dynamic-form-ui/models/relation-group/dynamic-relation-group.model';
@@ -13,6 +10,7 @@ import { AuthorityValue } from '../../core/integration/models/authority.value';
 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';
+import { WorkspaceItem } from '../../core/submission/models/workspaceitem.model';
 
 export const qualdropSelectConfig = {
   name: 'dc.identifier_QUALDROP_METADATA',
@@ -55,7 +53,10 @@ export const qualdropInputConfig = {
   id: 'dc_identifier_QUALDROP_VALUE',
   readOnly: false,
   disabled: false,
-  value: 'test'
+  repeatable: false,
+  value: 'test',
+  submissionId: '1234',
+  metadataFields: []
 };
 
 export const mockQualdropSelectModel = new DynamicSelectModel(qualdropSelectConfig);
@@ -65,7 +66,8 @@ export const qualdropConfig = {
   id: 'dc_identifier_QUALDROP_GROUP',
   legend: 'Identifiers',
   readOnly: false,
-  group: [mockQualdropSelectModel, mockQualdropInputModel]
+  group: [mockQualdropSelectModel, mockQualdropInputModel],
+  required: false
 };
 
 export const MockQualdropModel = new DynamicQualdropModel(qualdropConfig);
@@ -76,7 +78,8 @@ const rowArrayQualdropConfig = {
   notRepeatable: true,
   groupFactory: () => {
     return [MockQualdropModel];
-  }
+  },
+  required: false
 } as DynamicRowArrayModelConfig;
 
 export const MockRowArrayQualdropModel: DynamicRowArrayModel = new DynamicRowArrayModel(rowArrayQualdropConfig);
@@ -115,11 +118,13 @@ const mockFormRowModel = {
 } as FormRowModel;
 
 const relationGroupConfig = {
+  submissionId: '1234',
   id: 'relationGroup',
   formConfiguration: [mockFormRowModel],
   mandatoryField: 'false',
   relationFields: ['journal', 'issue'],
   scopeUUID: 'scope',
+  repeatable: false,
   submissionScope: SubmissionScopeType.WorkspaceItem,
   value: {
     journal: [
@@ -130,7 +135,8 @@ const relationGroupConfig = {
       'issue test 1',
       'issue test 2'
     ],
-  }
+  },
+  metadataFields: []
 };
 
 export const MockRelationModel: DynamicRelationGroupModel = new DynamicRelationGroupModel(relationGroupConfig);
@@ -152,11 +158,14 @@ export const inputWithLanguageAndAuthorityConfig = {
   id: 'testWithAuthority',
   readOnly: false,
   disabled: false,
+  repeatable: false,
   value:  {
     value: 'testWithLanguageAndAuthority',
     display: 'testWithLanguageAndAuthority',
     id: 'testWithLanguageAndAuthority',
-  }
+  },
+  submissionId: '1234',
+  metadataFields: []
 };
 
 export const mockInputWithLanguageAndAuthorityModel = new DsDynamicInputModel(inputWithLanguageAndAuthorityConfig);
@@ -177,7 +186,10 @@ export const inputWithLanguageConfig = {
   id: 'testWithLanguage',
   readOnly: false,
   disabled: false,
-  value: 'testWithLanguage'
+  repeatable: false,
+  value: 'testWithLanguage',
+  submissionId: '1234',
+  metadataFields: []
 };
 
 export const mockInputWithLanguageModel = new DsDynamicInputModel(inputWithLanguageConfig);
@@ -199,11 +211,14 @@ export const inputWithLanguageAndAuthorityArrayConfig = {
   id: 'testWithLanguageAndAuthorityArray',
   readOnly: false,
   disabled: false,
+  repeatable: false,
   value: [{
     value: 'testLanguageAndAuthorityArray',
     display: 'testLanguageAndAuthorityArray',
     id: 'testLanguageAndAuthorityArray',
-  }]
+  }],
+  submissionId: '1234',
+  metadataFields: []
 };
 
 export const mockInputWithLanguageAndAuthorityArrayModel = new DsDynamicInputModel(inputWithLanguageAndAuthorityArrayConfig);
@@ -213,7 +228,10 @@ export const inputWithFormFieldValueConfig = {
   id: 'testWithFormField',
   readOnly: false,
   disabled: false,
-  value: new FormFieldMetadataValueObject('testWithFormFieldValue')
+  repeatable: false,
+  value: new FormFieldMetadataValueObject('testWithFormFieldValue'),
+  submissionId: '1234',
+  metadataFields: []
 };
 
 export const mockInputWithFormFieldValueModel = new DsDynamicInputModel(inputWithFormFieldValueConfig);
@@ -223,7 +241,10 @@ export const inputWithAuthorityValueConfig = {
   id: 'testWithAuthorityField',
   readOnly: false,
   disabled: false,
-  value: Object.assign({}, new AuthorityValue(), { value: 'testWithAuthorityValue', id: 'testWithAuthorityValue', display: 'testWithAuthorityValue' })
+  repeatable: false,
+  value: Object.assign({}, new AuthorityValue(), { value: 'testWithAuthorityValue', id: 'testWithAuthorityValue', display: 'testWithAuthorityValue' }),
+  submissionId: '1234',
+  metadataFields: []
 };
 
 export const mockInputWithAuthorityValueModel = new DsDynamicInputModel(inputWithAuthorityValueConfig);
@@ -233,7 +254,10 @@ export const inputWithObjectValueConfig = {
   id: 'testWithObjectValue',
   readOnly: false,
   disabled: false,
-  value: { value: 'testWithObjectValue', id: 'testWithObjectValue', display: 'testWithObjectValue' }
+  repeatable: false,
+  value: { value: 'testWithObjectValue', id: 'testWithObjectValue', display: 'testWithObjectValue' },
+  submissionId: '1234',
+  metadataFields: []
 };
 
 export const mockInputWithObjectValueModel = new DsDynamicInputModel(inputWithObjectValueConfig);
@@ -248,6 +272,9 @@ export const fileFormEditInputConfig = {
   id: 'dc_title',
   readOnly: false,
   disabled: false,
+  repeatable: false,
+  submissionId: '1234',
+  metadataFields: []
 };
 
 export const mockFileFormEditInputModel = new DsDynamicInputModel(fileFormEditInputConfig);
diff --git a/src/app/shared/mocks/mock-request.service.ts b/src/app/shared/mocks/mock-request.service.ts
index 9a320b749c..103ab14d88 100644
--- a/src/app/shared/mocks/mock-request.service.ts
+++ b/src/app/shared/mocks/mock-request.service.ts
@@ -1,14 +1,16 @@
 import {of as observableOf,  Observable } from 'rxjs';
 import { RequestService } from '../../core/data/request.service';
 import { RequestEntry } from '../../core/data/request.reducer';
+import SpyObj = jasmine.SpyObj;
 
-export function getMockRequestService(requestEntry$: Observable<RequestEntry> = observableOf(new RequestEntry())): RequestService {
+export function getMockRequestService(requestEntry$: Observable<RequestEntry> = observableOf(new RequestEntry())): SpyObj<RequestService> {
   return jasmine.createSpyObj('requestService', {
     configure: false,
     generateRequestId: 'clients/b186e8ce-e99c-4183-bc9a-42b4821bdb78',
     getByHref: requestEntry$,
     getByUUID: requestEntry$,
     uriEncodeBody: jasmine.createSpy('uriEncodeBody'),
+    hasByHrefObservable: observableOf(false),
     /* tslint:disable:no-empty */
     removeByHrefSubstring: () => {}
     /* tslint:enable:no-empty */
diff --git a/src/app/shared/mocks/mock-search-service.ts b/src/app/shared/mocks/mock-search-service.ts
index 20da2049d1..74dec2ff40 100644
--- a/src/app/shared/mocks/mock-search-service.ts
+++ b/src/app/shared/mocks/mock-search-service.ts
@@ -1,5 +1,5 @@
 import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../+search-page/search-service/search.service';
+import { SearchService } from '../../core/shared/search/search.service';
 
 export function getMockSearchService(): SearchService {
   return jasmine.createSpyObj('searchService', {
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 edf6ae4195..71991bdf25 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
@@ -17,11 +17,10 @@ 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 { createSuccessfulRemoteDataObject } from '../../testing/utils';
-import { CoreModule } from '../../../core/core.module';
 import { getMockSearchService } from '../../mocks/mock-search-service';
 import { getMockRequestService } from '../../mocks/mock-request.service';
-import { SearchService } from '../../../+search-page/search-service/search.service';
 import { RequestService } from '../../../core/data/request.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 let component: ClaimedTaskActionsComponent;
 let fixture: ComponentFixture<ClaimedTaskActionsComponent>;
@@ -30,52 +29,67 @@ let mockObject: ClaimedTask;
 let notificationsServiceStub: NotificationsServiceStub;
 let router: RouterStub;
 
-const mockDataService = jasmine.createSpyObj('ClaimedTaskDataService', {
-  approveTask: jasmine.createSpy('approveTask'),
-  rejectTask: jasmine.createSpy('rejectTask'),
-  returnToPoolTask: jasmine.createSpy('returnToPoolTask'),
-});
+let mockDataService;
 
-const searchService = getMockSearchService();
+let searchService;
 
-const requestServce = getMockRequestService();
+let requestServce;
 
-const item = Object.assign(new Item(), {
-  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 rdItem = createSuccessfulRemoteDataObject(item);
-const workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
-const rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
-mockObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem), id: '1234' });
+let item;
+let rdItem;
+let workflowitem;
+let rdWorkflowitem;
+
+function init() {
+  mockDataService = jasmine.createSpyObj('ClaimedTaskDataService', {
+    approveTask: jasmine.createSpy('approveTask'),
+    rejectTask: jasmine.createSpy('rejectTask'),
+    returnToPoolTask: jasmine.createSpy('returnToPoolTask'),
+  });
+
+  searchService = getMockSearchService();
+
+  requestServce = getMockRequestService();
+
+  item = Object.assign(new Item(), {
+    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'
+        }
+      ]
+    }
+  });
+  rdItem = createSuccessfulRemoteDataObject(item);
+  workflowitem = Object.assign(new WorkflowItem(), { item: observableOf(rdItem) });
+  rdWorkflowitem = createSuccessfulRemoteDataObject(workflowitem);
+  mockObject = Object.assign(new ClaimedTask(), { workflowitem: observableOf(rdWorkflowitem), id: '1234' });
+
+}
 
 describe('ClaimedTaskActionsComponent', () => {
   beforeEach(async(() => {
+    init();
     TestBed.configureTestingModule({
       imports: [
         TranslateModule.forRoot({
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 6355b4eca1..81d24fa1d7 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
@@ -13,8 +13,8 @@ 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 { SearchService } from '../../../+search-page/search-service/search.service';
 import { RequestService } from '../../../core/data/request.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 /**
  * This component represents actions related to ClaimedTask object.
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 d121c990d2..1890c02e1d 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
@@ -12,10 +12,10 @@ import { ItemActionsComponent } from './item-actions.component';
 import { ItemDataService } from '../../../core/data/item-data.service';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service-stub';
-import { SearchService } from '../../../+search-page/search-service/search.service';
 import { RequestService } from '../../../core/data/request.service';
 import { getMockSearchService } from '../../mocks/mock-search-service';
 import { getMockRequestService } from '../../mocks/mock-request.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 let component: ItemActionsComponent;
 let fixture: ComponentFixture<ItemActionsComponent>;
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 7f6307c5ec..8026303c61 100644
--- a/src/app/shared/mydspace-actions/item/item-actions.component.ts
+++ b/src/app/shared/mydspace-actions/item/item-actions.component.ts
@@ -7,8 +7,8 @@ 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 { SearchService } from '../../../+search-page/search-service/search.service';
 import { RequestService } from '../../../core/data/request.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 /**
  * This component represents mydspace actions related to Item object.
diff --git a/src/app/shared/mydspace-actions/mydspace-actions.ts b/src/app/shared/mydspace-actions/mydspace-actions.ts
index 88d09c60a8..c83fa35b24 100644
--- a/src/app/shared/mydspace-actions/mydspace-actions.ts
+++ b/src/app/shared/mydspace-actions/mydspace-actions.ts
@@ -11,9 +11,9 @@ import { ResourceType } from '../../core/shared/resource-type';
 import { NotificationOptions } from '../notifications/models/notification-options.model';
 import { NotificationsService } from '../notifications/notifications.service';
 import { TranslateService } from '@ngx-translate/core';
-import { SearchService } from '../../+search-page/search-service/search.service';
 import { RequestService } from '../../core/data/request.service';
 import { Subscription } from 'rxjs';
+import { SearchService } from '../../core/shared/search/search.service';
 
 /**
  * Abstract class for all different representations of mydspace actions
@@ -76,7 +76,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) => this.requestService.removeByHrefSubstring(cachedHref))
+      tap((cachedHref: string) => this.requestService.removeByHrefSubstring(cachedHref))
     ).subscribe(() => this.router.navigateByUrl(url));
   }
 
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 f9d88d610a..eb980f0351 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
@@ -18,9 +18,9 @@ import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
 import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { createSuccessfulRemoteDataObject } from '../../testing/utils';
 import { getMockRequestService } from '../../mocks/mock-request.service';
-import { SearchService } from '../../../+search-page/search-service/search.service';
 import { RequestService } from '../../../core/data/request.service';
 import { getMockSearchService } from '../../mocks/mock-search-service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 let component: PoolTaskActionsComponent;
 let fixture: ComponentFixture<PoolTaskActionsComponent>;
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 b284be6f0b..892298d2f7 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
@@ -13,8 +13,8 @@ import { PoolTaskDataService } from '../../../core/tasks/pool-task-data.service'
 import { isNotUndefined } from '../../empty.util';
 import { MyDSpaceActionsComponent } from '../mydspace-actions';
 import { NotificationsService } from '../../notifications/notifications.service';
-import { SearchService } from '../../../+search-page/search-service/search.service';
 import { RequestService } from '../../../core/data/request.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 /**
  * 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 69c22ccce9..894c8ad8ab 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
@@ -7,7 +7,6 @@ import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { MockTranslateLoader } from '../../mocks/mock-translate-loader';
 import { RouterStub } from '../../testing/router-stub';
-import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
 import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
 import { WorkflowitemActionsComponent } from './workflowitem-actions.component';
@@ -16,9 +15,9 @@ import { NotificationsService } from '../../notifications/notifications.service'
 import { NotificationsServiceStub } from '../../testing/notifications-service-stub';
 import { createSuccessfulRemoteDataObject } from '../../testing/utils';
 import { getMockRequestService } from '../../mocks/mock-request.service';
-import { SearchService } from '../../../+search-page/search-service/search.service';
 import { RequestService } from '../../../core/data/request.service';
 import { getMockSearchService } from '../../mocks/mock-search-service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 let component: WorkflowitemActionsComponent;
 let fixture: ComponentFixture<WorkflowitemActionsComponent>;
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 45e777cef8..62a23ba66e 100644
--- a/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workflowitem/workflowitem-actions.component.ts
@@ -7,8 +7,8 @@ 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 { SearchService } from '../../../+search-page/search-service/search.service';
 import { RequestService } from '../../../core/data/request.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 /**
  * This component represents actions related to WorkflowItem object.
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 f664d80ac6..ac2d911a2c 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
@@ -11,7 +11,6 @@ import { MockTranslateLoader } from '../../mocks/mock-translate-loader';
 import { NotificationsService } from '../../notifications/notifications.service';
 import { NotificationsServiceStub } from '../../testing/notifications-service-stub';
 import { RouterStub } from '../../testing/router-stub';
-import { RemoteData } from '../../../core/data/remote-data';
 import { Item } from '../../../core/shared/item.model';
 import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 import { WorkspaceitemActionsComponent } from './workspaceitem-actions.component';
@@ -19,8 +18,8 @@ import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem
 import { createSuccessfulRemoteDataObject } from '../../testing/utils';
 import { RequestService } from '../../../core/data/request.service';
 import { getMockRequestService } from '../../mocks/mock-request.service';
-import { SearchService } from '../../../+search-page/search-service/search.service';
 import { getMockSearchService } from '../../mocks/mock-search-service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 let component: WorkspaceitemActionsComponent;
 let fixture: ComponentFixture<WorkspaceitemActionsComponent>;
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 0a5e18ff3d..2378c8e251 100644
--- a/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
+++ b/src/app/shared/mydspace-actions/workspaceitem/workspaceitem-actions.component.ts
@@ -9,8 +9,8 @@ import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.mod
 import { MyDSpaceActionsComponent } from '../mydspace-actions';
 import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
 import { NotificationsService } from '../../notifications/notifications.service';
-import { SearchService } from '../../../+search-page/search-service/search.service';
 import { RequestService } from '../../../core/data/request.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 
 /**
  * This component represents actions related to WorkspaceItem object.
diff --git a/src/app/shared/object-collection/object-collection.component.html b/src/app/shared/object-collection/object-collection.component.html
index 199f6d0bcf..57e1ccd81a 100644
--- a/src/app/shared/object-collection/object-collection.component.html
+++ b/src/app/shared/object-collection/object-collection.component.html
@@ -9,7 +9,11 @@
                 (pageChange)="onPageChange($event)"
                 (pageSizeChange)="onPageSizeChange($event)"
                 (sortDirectionChange)="onSortDirectionChange($event)"
+                (deselectObject)="deselectObject.emit($event)"
+                (selectObject)="selectObject.emit($event)"
                 (sortFieldChange)="onSortFieldChange($event)"
+                [selectable]="selectable"
+                [selectionConfig]="selectionConfig"
                 *ngIf="(currentMode$ | async) === viewModeEnum.ListElement">
 </ds-object-list>
 
diff --git a/src/app/shared/object-collection/object-collection.component.ts b/src/app/shared/object-collection/object-collection.component.ts
index 955c21a26a..f09ba3953e 100644
--- a/src/app/shared/object-collection/object-collection.component.ts
+++ b/src/app/shared/object-collection/object-collection.component.ts
@@ -48,6 +48,10 @@ export class ObjectCollectionComponent implements OnInit {
    * Whether or not to hide the gear to change the sort and pagination configuration
    */
   @Input() hideGear = false;
+  @Input() selectable = false;
+  @Input() selectionConfig: {repeatable: boolean, listId: string};
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
 
   /**
    * The link type of the rendered list elements
diff --git a/src/app/shared/object-collection/shared/claimed-task-search-result.model.ts b/src/app/shared/object-collection/shared/claimed-task-search-result.model.ts
index 4a7bf97850..1148ea1526 100644
--- a/src/app/shared/object-collection/shared/claimed-task-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/claimed-task-search-result.model.ts
@@ -1,6 +1,6 @@
 import { ClaimedTask } from '../../../core/tasks/models/claimed-task-object.model';
-import { SearchResult } from '../../../+search-page/search-result.model';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { SearchResult } from '../../search/search-result.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 /**
  * Represents a search result object of a ClaimedTask object
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 5e9afc59e5..3b32197533 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,6 +1,6 @@
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { Collection } from '../../../core/shared/collection.model';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 @searchResultFor(Collection)
 export class CollectionSearchResult extends SearchResult<Collection> {
diff --git a/src/app/shared/object-collection/shared/community-search-result.model.ts b/src/app/shared/object-collection/shared/community-search-result.model.ts
index 8e371c182c..9ce936b5d8 100644
--- a/src/app/shared/object-collection/shared/community-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/community-search-result.model.ts
@@ -1,6 +1,6 @@
 import { Community } from '../../../core/shared/community.model';
-import { SearchResult } from '../../../+search-page/search-result.model';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { SearchResult } from '../../search/search-result.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 @searchResultFor(Community)
 export class CommunitySearchResult extends SearchResult<Community> {
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 d38968ce76..442fb4230c 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,10 +1,12 @@
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { Item } from '../../../core/shared/item.model';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { inheritEquatable } from '../../../core/utilities/equals.decorators';
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
 import { ListableObject } from './listable-object.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 @searchResultFor(Item)
+@inheritEquatable(SearchResult)
 export class ItemSearchResult extends SearchResult<Item> {
 
   /**
diff --git a/src/app/shared/object-collection/shared/listable-object.model.ts b/src/app/shared/object-collection/shared/listable-object.model.ts
index d7eaf0750f..99144366b3 100644
--- a/src/app/shared/object-collection/shared/listable-object.model.ts
+++ b/src/app/shared/object-collection/shared/listable-object.model.ts
@@ -1,10 +1,9 @@
-import { TypedObject } from '../../../core/cache/object-cache.reducer';
+import { EquatableObject } from '../../../core/utilities/equatable';
 import { GenericConstructor } from '../../../core/shared/generic-constructor';
 
-export interface ListableObject extends TypedObject {
-
+export abstract class ListableObject extends EquatableObject<ListableObject> {
   /**
    * Method that returns as which type of object this object should be rendered
    */
-  getRenderTypes(): Array<string | GenericConstructor<ListableObject>>;
+  public abstract getRenderTypes(): Array<string | GenericConstructor<ListableObject>>;
 }
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 f470f566f0..59e2ddc822 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
@@ -14,7 +14,7 @@ const testType = 'TestType';
 const testContext = Context.Search;
 const testViewMode = ViewMode.StandalonePage;
 
-class TestType implements ListableObject {
+class TestType extends ListableObject {
   getRenderTypes(): Array<string | GenericConstructor<ListableObject>> {
     return [testType];
   }
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 648298b0fe..25232efa1d 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
@@ -41,6 +41,11 @@ export class ListableObjectComponentLoaderComponent implements OnInit {
    */
   @Input() linkType: CollectionElementLinkType;
 
+  /**
+   * The identifier of the list this element resides in
+   */
+  @Input() listID: string;
+
   /**
    * Directive hook used to place the dynamic child component
    */
@@ -62,6 +67,7 @@ export class ListableObjectComponentLoaderComponent implements OnInit {
     (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;
   }
 
   /**
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 c09f7df18c..d27fb331de 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
@@ -17,6 +17,11 @@ export class AbstractListableElementComponent<T extends ListableObject> {
    */
   @Input() linkType: CollectionElementLinkType;
 
+  /**
+   * The identifier of the list this element resides in
+   */
+  @Input() listID: string;
+
   /**
    * The available link types
    */
diff --git a/src/app/shared/object-collection/shared/pool-task-search-result.model.ts b/src/app/shared/object-collection/shared/pool-task-search-result.model.ts
index 0af55d31a4..3cff48ba51 100644
--- a/src/app/shared/object-collection/shared/pool-task-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/pool-task-search-result.model.ts
@@ -1,6 +1,6 @@
 import { PoolTask } from '../../../core/tasks/models/pool-task-object.model';
-import { SearchResult } from '../../../+search-page/search-result.model';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { SearchResult } from '../../search/search-result.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 /**
  * Represents a search result object of a PoolTask object
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
new file mode 100644
index 0000000000..92d85d03f4
--- /dev/null
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.html
@@ -0,0 +1,12 @@
+<ng-container *ngVar="selectionService?.isObjectSelected(selectionConfig?.listId, object) | async as checked">
+    <input *ngIf="selectionConfig.repeatable" class="form-check-input" type="checkbox"
+           [name]="'checkbox' + index"
+           [id]="'object' + index"
+           [ngModel]="selected$ | async"
+           (ngModelChange)="selectCheckbox($event)">
+    <input *ngIf="!selectionConfig.repeatable" class="form-check-input" type="radio"
+           [name]="'radio' + index"
+           [id]="'object' + index"
+           [checked]="selected$ | async"
+           (click)="selectRadio(!checked)">
+</ng-container>
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
new file mode 100644
index 0000000000..25cf6b15f0
--- /dev/null
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.spec.ts
@@ -0,0 +1,91 @@
+import { ComponentFixture, TestBed, async, tick, fakeAsync } 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 { FormsModule } from '@angular/forms';
+import { VarDirective } from '../../../utils/var.directive';
+import { of as observableOf } from 'rxjs';
+import { ListableObject } from '../listable-object.model';
+
+describe('SelectableListItemControlComponent', () => {
+  let comp: SelectableListItemControlComponent;
+  let fixture: ComponentFixture<SelectableListItemControlComponent>;
+  let de: DebugElement;
+  let el: HTMLElement;
+  let object;
+  let otherObject;
+  let selectionConfig;
+  let listId;
+  let index;
+  let selectionService;
+  let selection: ListableObject[];
+  let uuid1: string;
+  let uuid2: string;
+
+  function init() {
+    uuid1 = '0beb44f8-d2ed-459a-a1e7-ffbe059089a9';
+    uuid2 = 'e1dc80aa-c269-4aa5-b6bd-008d98056247';
+    listId = 'Test List ID';
+    object = Object.assign(new Item(), {uuid: uuid1});
+    otherObject = Object.assign(new Item(), {uuid: uuid2});
+    selectionConfig = {repeatable: false, listId};
+    index = 0;
+    selection = [otherObject];
+    selectionService = jasmine.createSpyObj('selectionService', {
+        selectSingle: jasmine.createSpy('selectSingle'),
+        deselectSingle: jasmine.createSpy('deselectSingle'),
+        isObjectSelected: observableOf(true),
+        getSelectableList: observableOf({ selection })
+      }
+    );
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      declarations: [SelectableListItemControlComponent, VarDirective],
+      imports: [FormsModule],
+      providers: [
+        {
+          provide: SelectableListService,
+          useValue: selectionService
+        }
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(SelectableListItemControlComponent);
+    comp = fixture.componentInstance; // SelectableListItemControlComponent test instance
+    de = fixture.debugElement;
+    el = de.nativeElement;
+    comp.object = object;
+    comp.selectionConfig = selectionConfig;
+    comp.index = index;
+    fixture.detectChanges();
+  });
+
+  it('should call deselectSingle on the service when the object when selectCheckbox is called with value false', () => {
+    comp.selectCheckbox(false);
+    expect(selectionService.deselectSingle).toHaveBeenCalledWith(listId, object);
+  });
+
+  it('should call selectSingle on the service when the object when selectCheckbox is called with value false', () => {
+    comp.selectCheckbox(true);
+    expect(selectionService.selectSingle).toHaveBeenCalledWith(listId, object);
+  });
+
+  it('should call selectSingle on the service when the object when selectRadio is called with value true and deselect all others in the selection', () => {
+    comp.selectRadio(true );
+    expect(selectionService.deselectSingle).toHaveBeenCalledWith(listId, selection[0]);
+    expect(selectionService.selectSingle).toHaveBeenCalledWith(listId, object);
+  });
+
+  it('should not call selectSingle on the service when the object when selectRadio is called with value false and not deselect all others in the selection', () => {
+    comp.selectRadio(false );
+    expect(selectionService.deselectSingle).not.toHaveBeenCalledWith(listId, selection[0]);
+    expect(selectionService.selectSingle).not.toHaveBeenCalledWith(listId, object);
+  });
+});
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
new file mode 100644
index 0000000000..d47e05c8fe
--- /dev/null
+++ b/src/app/shared/object-collection/shared/selectable-list-item-control/selectable-list-item-control.component.ts
@@ -0,0 +1,78 @@
+import { Component, ComponentFactoryResolver, EventEmitter, Input, OnInit, Output, ViewChild } 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 { Observable } from 'rxjs';
+
+@Component({
+  selector: 'ds-selectable-list-item-control',
+  // styleUrls: ['./selectable-list-item-control.component.scss'],
+  templateUrl: './selectable-list-item-control.component.html'
+})
+/**
+ * Component for rendering list item that has a control (checkbox or radio button) because it's selectable
+ */
+export class SelectableListItemControlComponent implements OnInit {
+  /**
+   * The item or metadata to determine the component for
+   */
+  @Input() object: ListableObject;
+
+  @Input() selectionConfig: { repeatable: boolean, listId: string };
+
+  /**
+   * Index of the control in the list
+   */
+  @Input() index: number;
+
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  selected$: Observable<boolean>;
+
+  constructor(public selectionService: SelectableListService) {
+  }
+
+  /**
+   * Setup the dynamic child component
+   */
+  ngOnInit(): void {
+    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);
+      }
+    })
+  }
+
+  selectCheckbox(value: boolean) {
+    if (value) {
+      this.selectionService.selectSingle(this.selectionConfig.listId, this.object);
+    } else {
+      this.selectionService.deselectSingle(this.selectionConfig.listId, this.object);
+    }
+  }
+
+  selectRadio(value: boolean) {
+    if (value) {
+      const selected$ = this.selectionService.getSelectableList(this.selectionConfig.listId);
+      selected$.pipe(
+        take(1),
+        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);
+        }
+      );
+    }
+  }
+}
diff --git a/src/app/shared/object-collection/shared/workflow-item-search-result.model.ts b/src/app/shared/object-collection/shared/workflow-item-search-result.model.ts
index 5684976e25..107b66cbee 100644
--- a/src/app/shared/object-collection/shared/workflow-item-search-result.model.ts
+++ b/src/app/shared/object-collection/shared/workflow-item-search-result.model.ts
@@ -1,6 +1,6 @@
 import { WorkflowItem } from '../../../core/submission/models/workflowitem.model';
-import { SearchResult } from '../../../+search-page/search-result.model';
-import { searchResultFor } from '../../../+search-page/search-service/search-result-element-decorator';
+import { SearchResult } from '../../search/search-result.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
 
 /**
  * Represents a search result object of a WorkflowItem object
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 12fde0f8f1..aa1d4988d4 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-page/search-service/search-result-element-decorator';
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { searchResultFor } from '../../search/search-result-element-decorator';
+import { SearchResult } from '../../search/search-result.model';
 
 /**
  * Represents a search result object of a WorkspaceItem object
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 2456913080..5c880133bc 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
@@ -2,7 +2,7 @@ import { Component, Input } from '@angular/core';
 
 import { Metadata } from '../../../../../core/shared/metadata.utils';
 import { Item } from '../../../../../core/shared/item.model';
-import { SearchResult } from '../../../../../+search-page/search-result.model';
+import { SearchResult } from '../../../../search/search-result.model';
 
 /**
  * This component show values for the given item metadata
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 53ff5ef403..84be0c1b05 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
@@ -88,7 +88,7 @@ describe('ItemDetailPreviewComponent', () => {
     component.object = { hitHighlights: {} } as any;
     component.item = mockItem;
     component.separator = ', ';
-    spyOn(component.item, 'getFiles').and.returnValue(mockItem.bundles);
+    spyOn(component.item, 'getFiles').and.returnValue(mockItem.bundles as any);
     fixture.detectChanges();
 
   }));
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 0e808321ae..9a8f5ebeec 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
@@ -7,9 +7,9 @@ import { Item } from '../../../../core/shared/item.model';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
 import { fadeInOut } from '../../../animations/fade';
 import { Bitstream } from '../../../../core/shared/bitstream.model';
-import { SearchResult } from '../../../../+search-page/search-result.model';
 import { FileService } from '../../../../core/shared/file.service';
 import { HALEndpointService } from '../../../../core/shared/hal-endpoint.service';
+import { SearchResult } from '../../../search/search-result.model';
 
 /**
  * This component show metadata for the given item object in the detail view.
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 f1e9fe698c..e56576a08b 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
@@ -3,8 +3,8 @@ 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 { SearchResult } from '../../../+search-page/search-result.model';
 import { hasValue } from '../../empty.util';
+import { SearchResult } from '../../search/search-result.model';
 
 /**
  * Component representing Search Results with ViewMode.DetailedElement
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 7bec565562..b1058c5e72 100644
--- a/src/app/shared/object-detail/object-detail.component.spec.ts
+++ b/src/app/shared/object-detail/object-detail.component.spec.ts
@@ -4,7 +4,6 @@ import { By } from '@angular/platform-browser';
 import { ObjectDetailComponent } from './object-detail.component';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 import { MockTranslateLoader } from '../mocks/mock-translate-loader';
-import { RemoteData } from '../../core/data/remote-data';
 import { PaginatedList } from '../../core/data/paginated-list';
 import { PageInfo } from '../../core/shared/page-info.model';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
@@ -14,7 +13,7 @@ import { DSpaceObject } from '../../core/shared/dspace-object.model';
 describe('ObjectDetailComponent', () => {
   let comp: ObjectDetailComponent;
   let fixture: ComponentFixture<ObjectDetailComponent>;
-  const testEvent = {test: 'test'};
+  const testEvent: any = {test: 'test'};
 
   const testObjects = [
     Object.assign (new DSpaceObject(), { one: 1 }),
@@ -28,7 +27,7 @@ describe('ObjectDetailComponent', () => {
     Object.assign (new DSpaceObject(), { nine: 9 }),
     Object.assign (new DSpaceObject(), { ten: 10 }),
   ];
-  const pageInfo = Object.assign(new PageInfo(), {elementsPerPage: 1, totalElements: 10, totalPages: 10, currentPage: 1})
+  const pageInfo = Object.assign(new PageInfo(), {elementsPerPage: 1, totalElements: 10, totalPages: 10, currentPage: 1});
   const mockRD = createSuccessfulRemoteDataObject(new PaginatedList(pageInfo, testObjects));
 
   beforeEach(async(() => {
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 75345338e7..8587e91302 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,6 +1,6 @@
 import { Component, Inject, OnInit } from '@angular/core';
 
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
 import { TruncatableService } from '../../truncatable/truncatable.service';
diff --git a/src/app/shared/object-list/item-type-badge/item-type-badge.component.ts b/src/app/shared/object-list/item-type-badge/item-type-badge.component.ts
index 5518ede202..88fe2d7f54 100644
--- a/src/app/shared/object-list/item-type-badge/item-type-badge.component.ts
+++ b/src/app/shared/object-list/item-type-badge/item-type-badge.component.ts
@@ -1,6 +1,4 @@
 import { Component, Input } from '@angular/core';
-import { ListableObject } from '../../object-collection/shared/listable-object.model';
-import { SearchResult } from '../../../+search-page/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 
 @Component({
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 d6b8c4c8fb..cce134f806 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
@@ -11,7 +11,6 @@ import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspa
 import { WorkflowItem } from '../../../../core/submission/models/workflowitem.model';
 import { createSuccessfulRemoteDataObject } from '../../../testing/utils';
 import { ClaimedTaskSearchResult } from '../../../object-collection/shared/claimed-task-search-result.model';
-import { TruncatableAction } from '../../../truncatable/truncatable.actions';
 import { TruncatableService } from '../../../truncatable/truncatable.service';
 
 let component: ClaimedSearchResultListElementComponent;
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 0395c8c84b..6d9f325757 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
@@ -3,7 +3,7 @@ import { Component, Input } from '@angular/core';
 import { Item } from '../../../../core/shared/item.model';
 import { fadeInOut } from '../../../animations/fade';
 import { MyDspaceItemStatusType } from '../../../object-collection/shared/mydspace-item-status/my-dspace-item-status-type';
-import { SearchResult } from '../../../../+search-page/search-result.model';
+import { SearchResult } from '../../../search/search-result.model';
 
 /**
  * This component show metadata for the given item object in the list view.
diff --git a/src/app/shared/object-list/object-list.component.html b/src/app/shared/object-list/object-list.component.html
index 1d49ea09d7..887be96785 100644
--- a/src/app/shared/object-list/object-list.component.html
+++ b/src/app/shared/object-list/object-list.component.html
@@ -1,18 +1,26 @@
 <ds-pagination
-  [paginationOptions]="config"
-  [pageInfoState]="objects?.payload"
-  [collectionSize]="objects?.payload?.totalElements"
-  [sortOptions]="sortConfig"
-  [hideGear]="hideGear"
-  [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
-  (pageChange)="onPageChange($event)"
-  (pageSizeChange)="onPageSizeChange($event)"
-  (sortDirectionChange)="onSortDirectionChange($event)"
-  (sortFieldChange)="onSortFieldChange($event)"
-  (paginationChange)="onPaginationChange($event)">
-  <ul *ngIf="objects?.hasSucceeded" class="list-unstyled">
-      <li *ngFor="let object of objects?.payload?.page; let i = index; let last = last" class="mt-4 mb-4" [class.border-bottom]="hasBorder && !last">
-        <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [index]="i" [context]="context" [linkType]="linkType"></ds-listable-object-component-loader>
-      </li>
-  </ul>
+        [paginationOptions]="config"
+        [pageInfoState]="objects?.payload"
+        [collectionSize]="objects?.payload?.totalElements"
+        [sortOptions]="sortConfig"
+        [hideGear]="hideGear"
+        [hidePagerWhenSinglePage]="hidePagerWhenSinglePage"
+        (pageChange)="onPageChange($event)"
+        (pageSizeChange)="onPageSizeChange($event)"
+        (sortDirectionChange)="onSortDirectionChange($event)"
+        (sortFieldChange)="onSortFieldChange($event)"
+        (paginationChange)="onPaginationChange($event)">
+    <ul *ngIf="objects?.hasSucceeded" class="list-unstyled" [ngClass]="{'ml-4': selectable}">
+        <li *ngFor="let object of objects?.payload?.page; let i = index; let last = last" class="mt-4 mb-4" [class.border-bottom]="hasBorder && !last">
+          <span *ngIf="selectable">
+                   <ds-selectable-list-item-control [index]="i"
+                                                    [object]="object"
+                                                    [selectionConfig]="selectionConfig"
+                                                    (deselectObject)="deselectObject.emit($event)"
+                                                    (selectObject)="selectObject.emit($event)"></ds-selectable-list-item-control>
+              </span>
+            <ds-listable-object-component-loader [object]="object" [viewMode]="viewMode" [index]="i" [context]="context" [linkType]="linkType"
+                                                 [listID]="selectionConfig?.listId"></ds-listable-object-component-loader>
+        </li>
+    </ul>
 </ds-pagination>
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 12ad032e98..4ed3519b03 100644
--- a/src/app/shared/object-list/object-list.component.spec.ts
+++ b/src/app/shared/object-list/object-list.component.spec.ts
@@ -2,16 +2,18 @@ import { async, ComponentFixture, fakeAsync, TestBed, tick } from '@angular/core
 import { ObjectListComponent } from './object-list.component';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { By } from '@angular/platform-browser';
+import { SelectableListService } from './selectable-list/selectable-list.service';
 
 describe('ObjectListComponent', () => {
   let comp: ObjectListComponent;
   let fixture: ComponentFixture<ObjectListComponent>;
-  const testEvent = {test: 'test'};
+  const testEvent: any = { test: 'test' };
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
       imports: [],
       declarations: [ObjectListComponent],
+      providers: [{ provide: SelectableListService, useValue: {} }],
       schemas: [NO_ERRORS_SCHEMA]
     }).overrideComponent(ObjectListComponent, {
       set: { changeDetection: ChangeDetectionStrategy.Default }
diff --git a/src/app/shared/object-list/object-list.component.ts b/src/app/shared/object-list/object-list.component.ts
index 1158085bb0..6ca7adb3f9 100644
--- a/src/app/shared/object-list/object-list.component.ts
+++ b/src/app/shared/object-list/object-list.component.ts
@@ -1,17 +1,11 @@
-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 { PaginatedList } from '../../core/data/paginated-list';
 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 { 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';
@@ -54,6 +48,8 @@ export class ObjectListComponent {
    * Whether or not the pager is visible when there is only a single page of results
    */
   @Input() hidePagerWhenSinglePage = true;
+  @Input() selectable = false;
+  @Input() selectionConfig: { repeatable: boolean, listId: string };
 
   /**
    * The link type of the listable elements
@@ -118,14 +114,20 @@ export class ObjectListComponent {
   /**
    * An event fired when on of the pagination parameters changes
    */
-  @Output() paginationChange: EventEmitter<SortDirection> = new EventEmitter<any>();
+  @Output() paginationChange: EventEmitter<any> = new EventEmitter<any>();
 
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
   /**
    * 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>();
 
+  constructor(protected selectionService: SelectableListService) {
+  }
+
   /**
    * Emits the current page when it changes
    * @param event The new page
@@ -164,5 +166,4 @@ export class ObjectListComponent {
   onPaginationChange(event) {
     this.paginationChange.emit(event);
   }
-
 }
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 93fc00bc87..54e8c9de01 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,7 +1,7 @@
 import { Component, Inject, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
 
-import { SearchResult } from '../../../+search-page/search-result.model';
+import { SearchResult } from '../../search/search-result.model';
 import { DSpaceObject } from '../../../core/shared/dspace-object.model';
 import { hasValue } from '../../empty.util';
 import { AbstractListableElementComponent } from '../../object-collection/shared/object-collection-element/abstract-listable-element.component';
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
new file mode 100644
index 0000000000..010ae5609d
--- /dev/null
+++ b/src/app/shared/object-list/selectable-list/selectable-list.actions.ts
@@ -0,0 +1,101 @@
+import { Action } from '@ngrx/store';
+import { type } from '../../ngrx/type';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
+
+/**
+ * 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 SelectableListActionTypes = {
+  SELECT: type('dspace/selectable-lists/SELECT'),
+  SELECT_SINGLE: type('dspace/selectable-lists/SELECT_SINGLE'),
+  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')
+};
+
+/**
+ * Abstract action class for actions on selectable lists
+ */
+/* tslint:disable:max-classes-per-file */
+export abstract class SelectableListAction implements Action {
+  // tslint:disable-next-line:no-shadowed-variable
+  constructor(public type, public id: string) {
+  }
+}
+
+/**
+ * Action to select objects in a the selectable list
+ */
+export class SelectableListSelectAction extends SelectableListAction {
+  payload: ListableObject[];
+
+  constructor(id: string, objects: ListableObject[]) {
+    super(SelectableListActionTypes.SELECT, id);
+    this.payload = objects;
+  }
+}
+/**
+ * Action to select a single object in a the selectable list
+ */
+export class SelectableListSelectSingleAction extends SelectableListAction {
+  payload: {
+    object: ListableObject,
+  };
+
+  constructor(id: string, object: ListableObject) {
+    super(SelectableListActionTypes.SELECT_SINGLE, id);
+    this.payload = { object };
+  }
+}
+
+/**
+ * Action to deselect a single object in a the selectable list
+ */
+export class SelectableListDeselectSingleAction extends SelectableListAction {
+  payload: ListableObject;
+
+  constructor(id: string, object: ListableObject) {
+    super(SelectableListActionTypes.DESELECT_SINGLE, id);
+    this.payload = object;
+  }
+}
+
+/**
+ * Action to deselect objects in a the selectable list
+ */
+export class SelectableListDeselectAction extends SelectableListAction {
+  payload: ListableObject[];
+
+  constructor(id: string, objects: ListableObject[]) {
+    super(SelectableListActionTypes.DESELECT, id);
+    this.payload = objects;
+  }
+}
+
+/**
+ * Action to set a new or overwrite an existing selection
+ */
+export class SelectableListSetSelectionAction extends SelectableListAction {
+  payload: ListableObject[];
+
+  constructor(id: string, objects: ListableObject[]) {
+    super(SelectableListActionTypes.SET_SELECTION, id);
+    this.payload = objects;
+  }
+}
+
+/**
+ * Action to deselect all currently selected objects
+ */
+export class SelectableListDeselectAllAction extends SelectableListAction {
+  constructor(id: string) {
+    super(SelectableListActionTypes.DESELECT_ALL, id);
+  }
+}
+/* tslint:enable:max-classes-per-file */
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
new file mode 100644
index 0000000000..29b60cdc02
--- /dev/null
+++ b/src/app/shared/object-list/selectable-list/selectable-list.reducer.spec.ts
@@ -0,0 +1,112 @@
+import {
+  SelectableListAction,
+  SelectableListDeselectAction, SelectableListDeselectAllAction,
+  SelectableListDeselectSingleAction,
+  SelectableListSelectAction,
+  SelectableListSelectSingleAction,
+  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';
+
+// tslint:disable:max-classes-per-file
+class SelectableObject extends ListableObject {
+  constructor(private value: string) {
+    super();
+  }
+
+  equals(other: SelectableObject): boolean {
+    return hasValue(this.value) && hasValue(other.value) && this.value === other.value;
+  }
+
+  getRenderTypes() {
+    return ['selectable'];
+  }
+}
+
+class NullAction extends SelectableListAction {
+  type = null;
+
+  constructor() {
+    super(undefined, undefined);
+  }
+}
+
+// tslint:enable:max-classes-per-file
+const listID1 = 'id1';
+const listID2 = 'id2';
+const value1 = 'Selected object';
+const value2 = 'Another selected object';
+const value3 = 'Selection';
+const value4 = 'Selected object numero 4';
+
+const selected1 = new SelectableObject(value1);
+const selected2 = new SelectableObject(value2);
+const selected3 = new SelectableObject(value3);
+const selected4 = new SelectableObject(value4);
+const testState = { [listID1]: { id: listID1, selection: [selected1, selected2] } };
+
+describe('selectableListReducer', () => {
+
+  it('should return the current state when no valid actions have been made', () => {
+    const state = {};
+    state[listID1] = {};
+    state[listID1] = { id: listID1, selection: [selected1, selected2] };
+    const action = new NullAction();
+    const newState = selectableListReducer(state, action);
+
+    expect(newState).toEqual(state);
+  });
+
+  it('should start with an empty object', () => {
+    const state = {};
+    const action = new NullAction();
+    const newState = selectableListReducer(undefined, action);
+
+    expect(newState).toEqual(state);
+  });
+
+  it('should add the payload to the existing list in response to the SELECT action for the given id', () => {
+    const action = new SelectableListSelectAction(listID1, [selected3, selected4]);
+    const newState = selectableListReducer(testState, action);
+
+    expect(newState[listID1].selection).toEqual([selected1, selected2, selected3, selected4]);
+  });
+
+  it('should add the payload to the existing list in response to the SELECT_SINGLE action for the given id', () => {
+    const action = new SelectableListSelectSingleAction(listID1, selected4);
+    const newState = selectableListReducer(testState, action);
+
+    expect(newState[listID1].selection).toEqual([selected1, selected2, selected4]);
+  });
+
+  it('should remove the payload from the existing list in response to the DESELECT action for the given id', () => {
+    const action = new SelectableListDeselectAction(listID1, [selected1, selected2]);
+    const newState = selectableListReducer(testState, action);
+
+    expect(newState[listID1].selection).toEqual([]);
+  });
+
+  it('should remove the payload from the existing list in response to the DESELECT_SINGLE action for the given id', () => {
+    const action = new SelectableListDeselectSingleAction(listID1, selected2);
+    const newState = selectableListReducer(testState, action);
+
+    expect(newState[listID1].selection).toEqual([selected1]);
+  });
+
+  it('should set the list to the payload in response to the SET_SELECTION action for the given id', () => {
+    const action = new SelectableListSetSelectionAction(listID2, [selected2, selected4]);
+    const newState = selectableListReducer(testState, action);
+
+    expect(newState[listID1].selection).toEqual(testState[listID1].selection);
+    expect(newState[listID2].selection).toEqual([selected2, selected4]);
+  });
+
+  it('should remove the payload from the existing list in response to the DESELECT action for the given id', () => {
+    const action = new SelectableListDeselectAllAction(listID1);
+    const newState = selectableListReducer(testState, action);
+
+    expect(newState[listID1].selection).toEqual([]);
+  });
+});
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
new file mode 100644
index 0000000000..4c7251e563
--- /dev/null
+++ b/src/app/shared/object-list/selectable-list/selectable-list.reducer.ts
@@ -0,0 +1,137 @@
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import {
+  SelectableListAction,
+  SelectableListActionTypes,
+  SelectableListSelectAction,
+  SelectableListSelectSingleAction,
+  SelectableListDeselectAction,
+  SelectableListDeselectSingleAction, SelectableListSetSelectionAction
+} from './selectable-list.actions';
+import { hasNoValue } from '../../empty.util';
+
+/**
+ * Represents the state of all selectable lists in the store
+ */
+export interface SelectableListsState {
+  [id: string]: SelectableListState;
+}
+
+/**
+ * Represents the state of a single selectable list in the store
+ */
+export interface SelectableListState {
+  id: string;
+  selection: ListableObject[];
+}
+
+/**
+ * Reducer that handles SelectableListAction to update the SelectableListsState
+ * @param {SelectableListsState} state The initial SelectableListsState
+ * @param {SelectableListAction} action The Action to be performed on the state
+ * @returns {SelectableListsState} The new, reducer SelectableListsState
+ */
+export function selectableListReducer(state: SelectableListsState = {}, action: SelectableListAction): SelectableListsState {
+  const listState: SelectableListState = state[action.id] || clearSelection(action.id);
+  switch (action.type) {
+    case SelectableListActionTypes.SELECT: {
+      const newListState = select(listState, action as SelectableListSelectAction);
+      return Object.assign({}, state, { [action.id]: newListState });
+    }
+    case SelectableListActionTypes.SELECT_SINGLE: {
+      const newListState = selectSingle(listState, action as SelectableListSelectSingleAction);
+      return Object.assign({}, state, { [action.id]: newListState });
+    }
+    case SelectableListActionTypes.DESELECT: {
+      const newListState = deselect(listState, action as SelectableListDeselectAction);
+      return Object.assign({}, state, { [action.id]: newListState });
+    }
+    case SelectableListActionTypes.DESELECT_SINGLE: {
+      const newListState = deselectSingle(listState, action as SelectableListDeselectSingleAction);
+      return Object.assign({}, state, { [action.id]: newListState });
+    }
+    case SelectableListActionTypes.SET_SELECTION: {
+      const newListState = setList(listState, action as SelectableListSetSelectionAction);
+      return Object.assign({}, state, { [action.id]: newListState });
+    }
+    case SelectableListActionTypes.DESELECT_ALL: {
+      const newListState = clearSelection(action.id);
+      return Object.assign({}, state, { [action.id]: newListState });
+    }
+    default: {
+      return state;
+    }
+  }
+}
+
+/**
+ * Adds multiple objects to the existing selection state
+ * @param state The current state
+ * @param action The action to perform
+ */
+function select(state: SelectableListState, action: SelectableListSelectAction) {
+  const filteredNewObjects = action.payload.filter((object) => !isObjectInSelection(state.selection, object));
+  const newSelection = [...state.selection, ...filteredNewObjects];
+  return Object.assign({}, state, { selection: newSelection });
+}
+
+/**
+ * Adds a single object to the existing selection state
+ * @param state The current state
+ * @param action The action to perform
+ */
+function selectSingle(state: SelectableListState, action: SelectableListSelectSingleAction) {
+  let newSelection = state.selection;
+  if (!isObjectInSelection(state.selection, action.payload.object)) {
+    newSelection = [...state.selection, action.payload.object];
+  }
+  return Object.assign({}, state, { selection: newSelection });
+}
+
+/**
+ * Removes multiple objects in the existing selection state
+ * @param state The current state
+ * @param action The action to perform
+ */
+function deselect(state: SelectableListState, action: SelectableListDeselectAction) {
+  const newSelection = state.selection.filter((selected) => hasNoValue(action.payload.find((object) => object.equals(selected))));
+  return Object.assign({}, state, { selection: newSelection });
+}
+
+/** Removes a single object from the existing selection state
+ *
+ * @param state The current state
+ * @param action The action to perform
+ */
+function deselectSingle(state: SelectableListState, action: SelectableListDeselectSingleAction) {
+  const newSelection = state.selection.filter((selected) => {
+    return !selected.equals(action.payload);
+  });
+  return Object.assign({}, state, { selection: newSelection });
+}
+
+/**
+ * Sets the selection state of the list
+ * @param state The current state
+ * @param action The action to perform
+ */
+function setList(state: SelectableListState, action: SelectableListSetSelectionAction) {
+  return Object.assign({}, state, { selection: action.payload });
+}
+
+/**
+ * Clears the selection
+ * @param state The current state
+ * @param action The action to perform
+ */
+function clearSelection(id: string) {
+  return { id: id, selection: [] };
+}
+
+/**
+ * Checks whether the object is in currently in the selection
+ * @param state The current state
+ * @param action The action to perform
+ */
+function isObjectInSelection(selection: ListableObject[], object: ListableObject) {
+  return selection.findIndex((selected) => selected.equals(object)) >= 0
+}
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
new file mode 100644
index 0000000000..2d4137f031
--- /dev/null
+++ b/src/app/shared/object-list/selectable-list/selectable-list.service.spec.ts
@@ -0,0 +1,103 @@
+import { Store } from '@ngrx/store';
+import { async, TestBed } from '@angular/core/testing';
+import { SelectableListService } from './selectable-list.service';
+import { ListableObject } from '../../object-collection/shared/listable-object.model';
+import { hasValue } from '../../empty.util';
+import {
+  SelectableListDeselectAction,
+  SelectableListDeselectSingleAction,
+  SelectableListSelectAction,
+  SelectableListSelectSingleAction
+} from './selectable-list.actions';
+import { AppState } from '../../../app.reducer';
+
+class SelectableObject extends ListableObject {
+  constructor(private value: string) {
+    super();
+  }
+
+  equals(other: SelectableObject): boolean {
+    return hasValue(this.value) && hasValue(other.value) && this.value === other.value;
+  }
+
+  getRenderTypes() {
+    return ['selectable'];
+  }
+}
+
+describe('SelectableListService', () => {
+  const listID1 = 'id1';
+  const value1 = 'Selected object';
+  const value2 = 'Another selected object';
+  const value3 = 'Selection';
+  const value4 = 'Selected object numero 4';
+
+  const selected1 = new SelectableObject(value1);
+  const selected2 = new SelectableObject(value2);
+  const selected3 = new SelectableObject(value3);
+  const selected4 = new SelectableObject(value4);
+
+  let service: SelectableListService;
+  const store: Store<AppState> = jasmine.createSpyObj('store', {
+    /* tslint:disable:no-empty */
+    dispatch: {},
+    /* tslint:enable:no-empty */
+  });
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+
+      providers: [
+        {
+          provide: Store, useValue: store
+        }
+      ]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    service = new SelectableListService(store);
+  });
+
+  describe('when the selectSingle method is triggered', () => {
+    beforeEach(() => {
+      service.selectSingle(listID1, selected3);
+    });
+
+    it('SelectableListSelectSingleAction should be dispatched to the store', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(new SelectableListSelectSingleAction(listID1, selected3));
+    });
+
+  });
+
+  describe('when the select method is triggered', () => {
+    beforeEach(() => {
+      service.select(listID1, [selected1, selected4]);
+    });
+
+    it('SelectableListSelectAction should be dispatched to the store', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(new SelectableListSelectAction(listID1, [selected1, selected4]));
+    });
+  });
+
+  describe('when the deselectSingle method is triggered', () => {
+    beforeEach(() => {
+      service.deselectSingle(listID1, selected4);
+    });
+
+    it('SelectableListDeselectSingleAction should be dispatched to the store', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(new SelectableListDeselectSingleAction(listID1, selected4));
+    });
+
+  });
+
+  describe('when the deselect method is triggered', () => {
+    beforeEach(() => {
+      service.deselect(listID1, [selected2, selected4]);
+    });
+
+    it('SelectableListDeselectAction should be dispatched to the store', () => {
+      expect(store.dispatch).toHaveBeenCalledWith(new SelectableListDeselectAction(listID1, [selected2, selected4]));
+    });
+  });
+
+});
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
new file mode 100644
index 0000000000..5a86c0b65d
--- /dev/null
+++ b/src/app/shared/object-list/selectable-list/selectable-list.service.ts
@@ -0,0 +1,94 @@
+import { Injectable } from '@angular/core';
+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 { ListableObject } from '../../object-collection/shared/listable-object.model';
+import {
+  SelectableListDeselectAction,
+  SelectableListDeselectAllAction,
+  SelectableListDeselectSingleAction,
+  SelectableListSelectAction,
+  SelectableListSelectSingleAction
+} from './selectable-list.actions';
+import { hasValue, isNotEmpty } from '../../empty.util';
+
+const selectableListsStateSelector = (state: AppState) => state.selectableLists;
+
+const menuByIDSelector = (id: string): MemoizedSelector<AppState, SelectableListState> => {
+  return keySelector<SelectableListState>(id, selectableListsStateSelector);
+};
+
+@Injectable()
+export class SelectableListService {
+
+  constructor(private store: Store<AppState>) {
+  }
+
+  /**
+   * Retrieve a selectable list's state by its ID
+   * @param {string} id ID of the requested Selectable list
+   * @returns {Observable<SelectableListState>} Observable that emits the current state of the requested selectable list
+   */
+  getSelectableList(id: string): Observable<SelectableListState> {
+    return this.store.pipe(select(menuByIDSelector(id)));
+  }
+
+  /**
+   * Select an object in a specific list in the store
+   * @param {string} id The id of the list on which the object should be selected
+   * @param {ListableObject} object The object to select
+   */
+  selectSingle(id: string, object: ListableObject) {
+    this.store.dispatch(new SelectableListSelectSingleAction(id, object));
+  }
+
+  /**
+   * Select multiple objects in a specific list in the store
+   * @param {string} id The id of the list on which the objects should be selected
+   * @param {ListableObject[]} objects The objects to select
+   */
+  select(id: string, objects: ListableObject[]) {
+    this.store.dispatch(new SelectableListSelectAction(id, objects));
+  }
+
+  /**
+   * Deselect an object in a specific list in the store
+   * @param {string} id The id of the list on which the object should be deselected
+   * @param {ListableObject} object The object to deselect
+   */
+  deselectSingle(id: string, object: ListableObject) {
+    this.store.dispatch(new SelectableListDeselectSingleAction(id, object));
+  }
+
+  /**
+   * Deselect multiple objects in a specific list in the store
+   * @param {string} id The id of the list on which the objects should be deselected
+   * @param {ListableObject[]} objects The objects to deselect
+   */
+  deselect(id: string, objects: ListableObject[]) {
+    this.store.dispatch(new SelectableListDeselectAction(id, objects));
+  }
+
+  /**
+   * Deselect all objects in a specific list in the store
+   * @param {string} id The id of the list on which the objects should be deselected
+   */
+  deselectAll(id: string) {
+    this.store.dispatch(new SelectableListDeselectAllAction(id));
+  }
+
+  /**
+   * Check if a given object is selected in a specific list
+   * @param {string} id The ID of the selectable list the object should be selected in
+   * @param {ListableObject} object The object to check for if it's selected
+   * @returns {Observable<boolean>} Emits true if the given object is selected, emits false when it's deselected
+   */
+  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()
+    );
+  }
+}
diff --git a/src/app/shared/page-size-selector/page-size-selector.component.html b/src/app/shared/page-size-selector/page-size-selector.component.html
new file mode 100644
index 0000000000..d7db450d7b
--- /dev/null
+++ b/src/app/shared/page-size-selector/page-size-selector.component.html
@@ -0,0 +1,13 @@
+<div class="page-size-settings">
+    <ds-sidebar-dropdown
+            [id]="'search-sidebar-rpp'"
+            [label]="'search.sidebar.settings.rpp'"
+            (change)="reloadRPP($event)"
+    >
+        <option *ngFor="let pageSizeOption of (paginationOptions$ | async).pageSizeOptions"
+                [value]="pageSizeOption"
+                [selected]="pageSizeOption === +((paginationOptions$ | async).pageSize) ? 'selected': null">
+            {{pageSizeOption}}
+        </option>
+    </ds-sidebar-dropdown>
+</div>
\ No newline at end of file
diff --git a/src/app/+search-page/search-settings/search-settings.component.scss b/src/app/shared/page-size-selector/page-size-selector.component.scss
similarity index 100%
rename from src/app/+search-page/search-settings/search-settings.component.scss
rename to src/app/shared/page-size-selector/page-size-selector.component.scss
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
new file mode 100644
index 0000000000..77e17e002e
--- /dev/null
+++ b/src/app/shared/page-size-selector/page-size-selector.component.spec.ts
@@ -0,0 +1,89 @@
+import { async, ComponentFixture, TestBed } 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 { By } from '@angular/platform-browser';
+import { first, take } from 'rxjs/operators';
+import { PageSizeSelectorComponent } from './page-size-selector.component';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+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';
+
+describe('PageSizeSelectorComponent', () => {
+
+  let comp: PageSizeSelectorComponent;
+  let fixture: ComponentFixture<PageSizeSelectorComponent>;
+
+  const pagination: PaginationComponentOptions = new PaginationComponentOptions();
+  pagination.id = 'search-results-pagination';
+  pagination.currentPage = 1;
+  pagination.pageSize = 10;
+  const sort: SortOptions = new SortOptions('score', SortDirection.DESC);
+
+  const queryParam = 'test query';
+  const scopeParam = '7669c72a-3f2a-451f-a3b9-9210e7a4c02f';
+  const paginatedSearchOptions = {
+    query: queryParam,
+    scope: scopeParam,
+    pagination,
+    sort
+  };
+
+  const activatedRouteStub = {
+    queryParams: observableOf({
+      query: queryParam,
+      scope: scopeParam
+    })
+  };
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
+      declarations: [PageSizeSelectorComponent, EnumKeysPipe, VarDirective],
+      providers: [
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
+        {
+          provide: SEARCH_CONFIG_SERVICE,
+          useValue: {
+            paginatedSearchOptions: observableOf(paginatedSearchOptions),
+          }
+        },
+      ],
+      schemas: [NO_ERRORS_SCHEMA]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(PageSizeSelectorComponent);
+    comp = fixture.componentInstance;
+
+    // SearchPageComponent test instance
+    fixture.detectChanges();
+
+  });
+
+  it('it should show the size settings with the respective selectable options', (done) => {
+    (comp as any).paginationOptions$.pipe(first()).subscribe((options) => {
+        const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
+        expect(pageSizeSetting).toBeDefined();
+        const childElements = pageSizeSetting.queryAll(By.css('option'));
+        expect(childElements.length).toEqual(options.pageSizeOptions.length);
+        done();
+      }
+    )
+  });
+
+  it('should have the proper rpp value selected by default', (done) => {
+    (comp as any).paginationOptions$.pipe(take(1)).subscribe((options) => {
+      const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
+      const childElementToBeSelected = pageSizeSetting.query(By.css('option[value="10"][selected="selected"]'));
+      expect(childElementToBeSelected).toBeDefined();
+      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
new file mode 100644
index 0000000000..b200c337f8
--- /dev/null
+++ b/src/app/shared/page-size-selector/page-size-selector.component.ts
@@ -0,0 +1,52 @@
+import { Component, Inject, Input, OnInit } from '@angular/core';
+import { PaginationComponentOptions } from '../pagination/pagination-component-options.model';
+import { Observable } from 'rxjs';
+import { ActivatedRoute, NavigationExtras, 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/paginated-search-options.model';
+import { map } from 'rxjs/operators';
+
+@Component({
+  selector: 'ds-page-size-selector',
+  styleUrls: ['./page-size-selector.component.scss'],
+  templateUrl: './page-size-selector.component.html'
+})
+
+/**
+ * This component represents the part of the search sidebar that contains the page size settings.
+ */
+export class PageSizeSelectorComponent implements OnInit {
+  /**
+   * The configuration for the current paginated search results
+   */
+  paginationOptions$: Observable<PaginationComponentOptions>;
+
+  constructor(private route: ActivatedRoute,
+              private router: Router,
+              @Inject(SEARCH_CONFIG_SERVICE) public searchConfigurationService: SearchConfigurationService) {
+  }
+
+  /**
+   * Initialize paginated search options
+   */
+  ngOnInit(): void {
+    this.paginationOptions$ = this.searchConfigurationService.paginatedSearchOptions.pipe(map((options: PaginatedSearchOptions) => options.pagination));
+  }
+
+  /**
+   * Method to change the current page size (results per page)
+   * @param {Event} event Change event containing the new page size value
+   */
+  reloadRPP(event: Event) {
+    const value = (event.target as HTMLInputElement).value;
+    const navigationExtras: NavigationExtras = {
+      queryParams: {
+        pageSize: value,
+        page: 1
+      },
+      queryParamsHandling: 'merge'
+    };
+    this.router.navigate([], navigationExtras);
+  }
+}
diff --git a/src/app/shared/pagination/pagination.component.ts b/src/app/shared/pagination/pagination.component.ts
index e5cb1f448a..9c378d1aff 100644
--- a/src/app/shared/pagination/pagination.component.ts
+++ b/src/app/shared/pagination/pagination.component.ts
@@ -15,7 +15,7 @@ import { isNumeric } from 'rxjs/internal-compatibility';
 import { isEqual, isObject, transform } from 'lodash';
 
 import { HostWindowService } from '../host-window.service';
-import { HostWindowState } from '../host-window.reducer';
+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, isNotEmpty } from '../empty.util';
@@ -225,10 +225,14 @@ export class PaginationComponent implements OnDestroy, OnInit {
   }
 
   /**
+   * @param cdRef
+   *    ChangeDetectorRef is a singleton service provided by Angular.
    * @param route
    *    Route is a singleton service provided by Angular.
    * @param router
    *    Router is a singleton service provided by Angular.
+   * @param hostWindowService
+   *    the HostWindowService singleton.
    */
   constructor(private cdRef: ChangeDetectorRef,
               private route: ActivatedRoute,
@@ -243,7 +247,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The page being navigated to.
    */
   public doPageChange(page: number) {
-    this.updateRoute({ page: page.toString() });
+    this.updateRoute({ pageId: this.id, page: page.toString() });
   }
 
   /**
@@ -253,7 +257,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The page size being navigated to.
    */
   public doPageSizeChange(pageSize: number) {
-    this.updateRoute({ page: 1, pageSize: pageSize });
+    this.updateRoute({ pageId: this.id, page: 1, pageSize: pageSize });
   }
 
   /**
@@ -263,7 +267,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The sort direction being navigated to.
    */
   public doSortDirectionChange(sortDirection: SortDirection) {
-    this.updateRoute({ page: 1, sortDirection: sortDirection });
+    this.updateRoute({ pageId: this.id, page: 1, sortDirection: sortDirection });
   }
 
   /**
@@ -273,7 +277,7 @@ export class PaginationComponent implements OnDestroy, OnInit {
    *    The sort field being navigated to.
    */
   public doSortFieldChange(field: string) {
-    this.updateRoute({ page: 1, sortField: field });
+    this.updateRoute({ pageId: this.id, page: 1, sortField: field });
   }
 
   /**
@@ -328,13 +332,19 @@ export class PaginationComponent implements OnDestroy, OnInit {
    * Method to emit a general pagination change event
    */
   private emitPaginationChange() {
-    this.paginationChange.emit({
-      pageId: this.id,
-      page: this.currentPage,
-      pageSize: this.pageSize,
-      sortDirection: this.sortDirection,
-      sortField: this.sortField
-    });
+    this.paginationChange.emit(
+      {
+        pagination: Object.assign(
+          new PaginationComponentOptions(),
+          {
+            id: this.id,
+            currentPage: this.currentPage,
+            pageSize: this.pageSize,
+          }),
+        sort: Object.assign(
+          new SortOptions(this.sortField, this.sortDirection)
+        )
+      })
   }
 
   /**
@@ -407,27 +417,30 @@ export class PaginationComponent implements OnDestroy, OnInit {
    * Method to update all pagination variables to the current query parameters
    */
   private setFields() {
-    // (+) converts string to a number
-    const page = this.currentQueryParams.page;
-    if (this.currentPage !== +page) {
-      this.setPage(+page);
-    }
+    // set fields only when page id is the one configured for this pagination instance
+    if (this.currentQueryParams.pageId === this.id) {
+      // (+) converts string to a number
+      const page = this.currentQueryParams.page;
+      if (this.currentPage !== +page) {
+        this.setPage(+page);
+      }
 
-    const pageSize = this.currentQueryParams.pageSize;
-    if (this.pageSize !== +pageSize) {
-      this.setPageSize(+pageSize);
-    }
+      const pageSize = this.currentQueryParams.pageSize;
+      if (this.pageSize !== +pageSize) {
+        this.setPageSize(+pageSize);
+      }
 
-    const sortDirection = this.currentQueryParams.sortDirection;
-    if (this.sortDirection !== sortDirection) {
-      this.setSortDirection(sortDirection);
-    }
+      const sortDirection = this.currentQueryParams.sortDirection;
+      if (this.sortDirection !== sortDirection) {
+        this.setSortDirection(sortDirection);
+      }
 
-    const sortField = this.currentQueryParams.sortField;
-    if (this.sortField !== sortField) {
-      this.setSortField(sortField);
+      const sortField = this.currentQueryParams.sortField;
+      if (this.sortField !== sortField) {
+        this.setSortField(sortField);
+      }
+      this.cdRef.detectChanges();
     }
-    this.cdRef.detectChanges();
   }
 
   /**
@@ -507,5 +520,4 @@ export class PaginationComponent implements OnDestroy, OnInit {
   get shouldShowBottomPager(): boolean {
     return this.hasMultiplePages || !this.hidePagerWhenSinglePage
   }
-
 }
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 fb632c533a..74ed4bb913 100644
--- a/src/app/shared/search-form/search-form.component.spec.ts
+++ b/src/app/shared/search-form/search-form.component.spec.ts
@@ -3,12 +3,11 @@ import { By } from '@angular/platform-browser';
 import { DebugElement } from '@angular/core';
 import { SearchFormComponent } from './search-form.component';
 import { FormsModule } from '@angular/forms';
-import { ResourceType } from '../../core/shared/resource-type';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Community } from '../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { SearchService } from '../../+search-page/search-service/search.service';
+import { SearchService } from '../../core/shared/search/search.service';
 
 describe('SearchFormComponent', () => {
   let comp: SearchFormComponent;
diff --git a/src/app/shared/search-form/search-form.component.ts b/src/app/shared/search-form/search-form.component.ts
index 6b81b103ca..c49353deb3 100644
--- a/src/app/shared/search-form/search-form.component.ts
+++ b/src/app/shared/search-form/search-form.component.ts
@@ -4,7 +4,8 @@ import { Router } from '@angular/router';
 import { hasValue, isNotEmpty } from '../empty.util';
 import { QueryParamsHandling } from '@angular/router/src/config';
 import { MYDSPACE_ROUTE } from '../../+my-dspace-page/my-dspace-page.component';
-import { SearchService } from '../../+search-page/search-service/search.service';
+import { SearchService } from '../../core/shared/search/search.service';
+import { currentPath } from '../utils/route.utils';
 
 /**
  * This component renders a simple item page.
@@ -104,7 +105,7 @@ export class SearchFormComponent {
    */
   public getSearchLink(): string {
     if (this.inPlaceSearch) {
-      return './';
+      return currentPath(this.router);
     }
     return this.searchService.getSearchLink();
   }
diff --git a/src/app/+search-page/search-service/facet-value.model.ts b/src/app/shared/search/facet-value.model.ts
similarity index 100%
rename from src/app/+search-page/search-service/facet-value.model.ts
rename to src/app/shared/search/facet-value.model.ts
diff --git a/src/app/+search-page/search-service/filter-type.model.ts b/src/app/shared/search/filter-type.model.ts
similarity index 100%
rename from src/app/+search-page/search-service/filter-type.model.ts
rename to src/app/shared/search/filter-type.model.ts
diff --git a/src/app/shared/host-window.reducer.ts b/src/app/shared/search/host-window.reducer.ts
similarity index 83%
rename from src/app/shared/host-window.reducer.ts
rename to src/app/shared/search/host-window.reducer.ts
index f8287efdc1..17be02c992 100644
--- a/src/app/shared/host-window.reducer.ts
+++ b/src/app/shared/search/host-window.reducer.ts
@@ -1,4 +1,4 @@
-import { HostWindowAction, HostWindowActionTypes } from './host-window.actions';
+import { HostWindowAction, HostWindowActionTypes } from '../host-window.actions';
 
 export interface HostWindowState {
   width: number;
diff --git a/src/app/+search-page/normalized-search-result.model.ts b/src/app/shared/search/normalized-search-result.model.ts
similarity index 76%
rename from src/app/+search-page/normalized-search-result.model.ts
rename to src/app/shared/search/normalized-search-result.model.ts
index 8b1c015fef..3904b4a494 100644
--- a/src/app/+search-page/normalized-search-result.model.ts
+++ b/src/app/shared/search/normalized-search-result.model.ts
@@ -1,6 +1,6 @@
 import { autoserialize, inheritSerialization } from 'cerialize';
-import { MetadataMap } from '../core/shared/metadata.models';
-import { NormalizedObject } from '../core/cache/models/normalized-object.model';
+import { MetadataMap } from '../../core/shared/metadata.models';
+import { NormalizedObject } from '../../core/cache/models/normalized-object.model';
 
 /**
  * Represents a normalized version of a search result object of a certain DSpaceObject
diff --git a/src/app/+search-page/paginated-search-options.model.spec.ts b/src/app/shared/search/paginated-search-options.model.spec.ts
similarity index 83%
rename from src/app/+search-page/paginated-search-options.model.spec.ts
rename to src/app/shared/search/paginated-search-options.model.spec.ts
index 22b3f146b2..2702c3ff01 100644
--- a/src/app/+search-page/paginated-search-options.model.spec.ts
+++ b/src/app/shared/search/paginated-search-options.model.spec.ts
@@ -1,7 +1,7 @@
-import { SortDirection, SortOptions } from '../core/cache/models/sort-options.model';
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
+import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.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 { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
 import { SearchFilter } from './search-filter.model';
 
 describe('PaginatedSearchOptions', () => {
diff --git a/src/app/+search-page/paginated-search-options.model.ts b/src/app/shared/search/paginated-search-options.model.ts
similarity index 82%
rename from src/app/+search-page/paginated-search-options.model.ts
rename to src/app/shared/search/paginated-search-options.model.ts
index 45cd0b8f09..13ab4cabea 100644
--- a/src/app/+search-page/paginated-search-options.model.ts
+++ b/src/app/shared/search/paginated-search-options.model.ts
@@ -1,9 +1,9 @@
-import { SortOptions } from '../core/cache/models/sort-options.model';
-import { PaginationComponentOptions } from '../shared/pagination/pagination-component-options.model';
-import { isNotEmpty } from '../shared/empty.util';
+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 { DSpaceObjectType } from '../../core/shared/dspace-object-type.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/+search-page/search-service/search-filter-config.model.ts b/src/app/shared/search/search-filter-config.model.ts
similarity index 100%
rename from src/app/+search-page/search-service/search-filter-config.model.ts
rename to src/app/shared/search/search-filter-config.model.ts
diff --git a/src/app/+search-page/search-filter.model.ts b/src/app/shared/search/search-filter.model.ts
similarity index 87%
rename from src/app/+search-page/search-filter.model.ts
rename to src/app/shared/search/search-filter.model.ts
index 2f81f67d83..9e93bafed8 100644
--- a/src/app/+search-page/search-filter.model.ts
+++ b/src/app/shared/search/search-filter.model.ts
@@ -1,7 +1,7 @@
 /**
  * Represents a search filter
  */
-import { hasValue } from '../shared/empty.util';
+import { hasValue } from '../empty.util';
 
 export class SearchFilter {
   key: string;
diff --git a/src/app/+search-page/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
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
similarity index 80%
rename from src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
index 33e354f2d8..c1252d7167 100644
--- a/src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.scss
@@ -1,5 +1,5 @@
-@import '../../../../../styles/variables.scss';
-@import '../../../../../styles/mixins.scss';
+@import '../../../../../../styles/variables';
+@import '../../../../../../styles/mixins';
 
 .filters {
     a {
diff --git a/src/app/+search-page/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
similarity index 88%
rename from src/app/+search-page/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-authority-filter/search-authority-filter.component.ts
index 83131e1344..99e9bfac2e 100644
--- a/src/app/+search-page/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,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 
-import { FilterType } from '../../../search-service/filter-type.model';
+import { FilterType } from '../../../filter-type.model';
 import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 import { renderFacetFor } from '../search-filter-type-decorator';
-import { FacetValue } from '../../../search-service/facet-value.model';
+import { FacetValue } from '../../../facet-value.model';
 
 @Component({
   selector: 'ds-search-authority-filter',
diff --git a/src/app/+search-page/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
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
similarity index 99%
rename from src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
index 20f1bf2952..9bfd380441 100644
--- a/src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
+++ b/src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.scss
@@ -1,4 +1,3 @@
-
 .filters {
     .toggle-more-filters a {
         color: $link-color;
diff --git a/src/app/+search-page/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
similarity index 90%
rename from src/app/+search-page/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component.ts
index 5deaa34d29..49f361e75e 100644
--- a/src/app/+search-page/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,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FilterType } from '../../../search-service/filter-type.model';
+import { FilterType } from '../../../filter-type.model';
 import { renderFacetFor } from '../search-filter-type-decorator';
 import {
   facetLoad,
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.scss
diff --git a/src/app/+search-page/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
similarity index 88%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.spec.ts
index 245c0e3ddb..ff5db664db 100644
--- a/src/app/+search-page/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
@@ -3,17 +3,17 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { SearchFacetOptionComponent } from './search-facet-option.component';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { FilterType } from '../../../../search-service/filter-type.model';
-import { FacetValue } from '../../../../search-service/facet-value.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+import { FilterType } from '../../../../filter-type.model';
+import { FacetValue } from '../../../../facet-value.model';
 import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchServiceStub } from '../../../../../shared/testing/search-service-stub';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../../../testing/search-service-stub';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../../../shared/testing/router-stub';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { SearchFilterService } from '../../search-filter.service';
+import { RouterStub } from '../../../../../testing/router-stub';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { By } from '@angular/platform-browser';
 
 describe('SearchFacetOptionComponent', () => {
diff --git a/src/app/+search-page/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
similarity index 85%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.ts
index eae9a8cc7f..512cd5501c 100644
--- a/src/app/+search-page/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
@@ -2,13 +2,14 @@ import { combineLatest as observableCombineLatest, Observable, Subscription } fr
 import { map } from 'rxjs/operators';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { FacetValue } from '../../../../search-service/facet-value.model';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchFilterService } from '../../search-filter.service';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { hasValue } from '../../../../../shared/empty.util';
-import { FilterType } from '../../../../search-service/filter-type.model';
+import { FacetValue } from '../../../../facet-value.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+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 { hasValue } from '../../../../../empty.util';
+import { FilterType } from '../../../../filter-type.model';
+import { currentPath } from '../../../../../utils/route.utils';
 
 @Component({
   selector: 'ds-search-facet-option',
@@ -90,7 +91,7 @@ export class SearchFacetOptionComponent implements OnInit, OnDestroy {
    */
   private getSearchLink(): string {
     if (this.inPlaceSearch) {
-      return './';
+      return currentPath(this.router);
     }
     return this.searchService.getSearchLink();
   }
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.scss
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.scss
diff --git a/src/app/+search-page/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
similarity index 86%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.spec.ts
index d3264214ed..e6878dadd1 100644
--- a/src/app/+search-page/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
@@ -2,17 +2,17 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { FilterType } from '../../../../search-service/filter-type.model';
-import { FacetValue } from '../../../../search-service/facet-value.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+import { FilterType } from '../../../../filter-type.model';
+import { FacetValue } from '../../../../facet-value.model';
 import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchServiceStub } from '../../../../../shared/testing/search-service-stub';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../../../testing/search-service-stub';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../../../shared/testing/router-stub';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { SearchFilterService } from '../../search-filter.service';
+import { RouterStub } from '../../../../../testing/router-stub';
+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 {
diff --git a/src/app/+search-page/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
similarity index 84%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.ts
index 39b24b36fd..60b0198418 100644
--- a/src/app/+search-page/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
@@ -2,16 +2,17 @@ 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 '../../../../search-service/facet-value.model';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchFilterService } from '../../search-filter.service';
+import { FacetValue } from '../../../../facet-value.model';
+import { SearchFilterConfig } from '../../../../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';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { hasValue } from '../../../../../shared/empty.util';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { hasValue } from '../../../../../empty.util';
+import { currentPath } from '../../../../../utils/route.utils';
 
 const rangeDelimiter = '-';
 
@@ -91,7 +92,7 @@ export class SearchFacetRangeOptionComponent implements OnInit, OnDestroy {
    */
   private getSearchLink(): string {
     if (this.inPlaceSearch) {
-      return './';
+      return currentPath(this.router);
     }
     return this.searchService.getSearchLink();
   }
diff --git a/src/app/+search-page/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
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss b/src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.scss
diff --git a/src/app/+search-page/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
similarity index 89%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.spec.ts
index 01defb9893..4ea6571a87 100644
--- a/src/app/+search-page/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
@@ -2,18 +2,18 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { FilterType } from '../../../../search-service/filter-type.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+import { FilterType } from '../../../../filter-type.model';
 import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchServiceStub } from '../../../../../shared/testing/search-service-stub';
+import { SearchService } from '../../../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../../../testing/search-service-stub';
 import { Router } from '@angular/router';
-import { RouterStub } from '../../../../../shared/testing/router-stub';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { SearchFilterService } from '../../search-filter.service';
+import { RouterStub } from '../../../../../testing/router-stub';
+import { SearchConfigurationService } from '../../../../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../../../../core/shared/search/search-filter.service';
 import { SearchFacetSelectedOptionComponent } from './search-facet-selected-option.component';
-import { FacetValue } from '../../../../search-service/facet-value.model';
+import { FacetValue } from '../../../../facet-value.model';
 
 describe('SearchFacetSelectedOptionComponent', () => {
   let comp: SearchFacetSelectedOptionComponent;
diff --git a/src/app/+search-page/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
similarity index 84%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component.ts
index 3f84b7c4e5..0cf54d88f5 100644
--- a/src/app/+search-page/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,13 +1,14 @@
 import { combineLatest as observableCombineLatest, Observable, Subscription } from 'rxjs';
 import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { SearchFilterConfig } from '../../../../search-service/search-filter-config.model';
-import { SearchService } from '../../../../search-service/search.service';
-import { SearchFilterService } from '../../search-filter.service';
-import { hasValue } from '../../../../../shared/empty.util';
-import { SearchConfigurationService } from '../../../../search-service/search-configuration.service';
-import { FacetValue } from '../../../../search-service/facet-value.model';
-import { FilterType } from '../../../../search-service/filter-type.model';
+import { SearchFilterConfig } from '../../../../search-filter-config.model';
+import { SearchService } from '../../../../../../core/shared/search/search.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 '../../../../facet-value.model';
+import { FilterType } from '../../../../filter-type.model';
+import { currentPath } from '../../../../../utils/route.utils';
 
 @Component({
   selector: 'ds-search-facet-selected-option',
@@ -77,7 +78,7 @@ export class SearchFacetSelectedOptionComponent implements OnInit, OnDestroy {
    */
   private getSearchLink(): string {
     if (this.inPlaceSearch) {
-      return './';
+      return currentPath(this.router);
     }
     return this.searchService.getSearchLink();
   }
diff --git a/src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html b/src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.html
diff --git a/src/app/+search-page/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
similarity index 84%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component.ts
index 6720b30681..da0d1776e3 100644
--- a/src/app/+search-page/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,9 +1,9 @@
 import { Component, Injector, Input, OnInit } from '@angular/core';
 import { renderFilterType } from '../search-filter-type-decorator';
-import { FilterType } from '../../../search-service/filter-type.model';
-import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { FILTER_CONFIG, IN_PLACE_SEARCH } from '../search-filter.service';
-import { GenericConstructor } from '../../../../core/shared/generic-constructor';
+import { FilterType } from '../../../filter-type.model';
+import { SearchFilterConfig } from '../../../search-filter-config.model';
+import { FILTER_CONFIG, IN_PLACE_SEARCH } from '../../../../../core/shared/search/search-filter.service';
+import { GenericConstructor } from '../../../../../core/shared/generic-constructor';
 import { SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
 
 @Component({
diff --git a/src/app/+search-page/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
similarity index 86%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.spec.ts
index af5ca68de1..1b66e29246 100644
--- a/src/app/+search-page/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
@@ -2,25 +2,23 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../search-filter.service';
-import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { FilterType } from '../../../search-service/filter-type.model';
-import { FacetValue } from '../../../search-service/facet-value.model';
+import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
+import { SearchFilterConfig } from '../../../search-filter-config.model';
+import { FilterType } from '../../../filter-type.model';
+import { FacetValue } from '../../../facet-value.model';
 import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs';
-import { SearchService } from '../../../search-service/search.service';
-import { SearchServiceStub } from '../../../../shared/testing/search-service-stub';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { RouterStub } from '../../../../shared/testing/router-stub';
+import { SearchService } from '../../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../../testing/search-service-stub';
+import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { RouterStub } from '../../../../testing/router-stub';
 import { Router } from '@angular/router';
-import { PageInfo } from '../../../../core/shared/page-info.model';
+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 '../../../../shared/testing/search-configuration-service-stub';
-import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
-import { tap } from 'rxjs/operators';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+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 '../../../../testing/utils';
 
 describe('SearchFacetFilterComponent', () => {
   let comp: SearchFacetFilterComponent;
diff --git a/src/app/+search-page/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
similarity index 89%
rename from src/app/+search-page/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-facet-filter/search-facet-filter.component.ts
index cb25aba44e..1d6a85b95b 100644
--- a/src/app/+search-page/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
@@ -10,20 +10,21 @@ import { distinctUntilChanged, map, switchMap, take, tap } from 'rxjs/operators'
 import { animate, state, style, transition, trigger } from '@angular/animations';
 import { Component, Inject, OnDestroy, OnInit } from '@angular/core';
 import { Router } from '@angular/router';
-import { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { hasNoValue, hasValue, isNotEmpty } from '../../../../shared/empty.util';
-import { EmphasizePipe } from '../../../../shared/utils/emphasize.pipe';
-import { FacetValue } from '../../../search-service/facet-value.model';
-import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { SearchService } from '../../../search-service/search.service';
-import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../search-filter.service';
-import { SearchConfigurationService } from '../../../search-service/search-configuration.service';
-import { getSucceededRemoteData } from '../../../../core/shared/operators';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { RemoteData } from '../../../../../core/data/remote-data';
+import { hasNoValue, hasValue, isNotEmpty } from '../../../../empty.util';
+import { EmphasizePipe } from '../../../../utils/emphasize.pipe';
+import { FacetValue } from '../../../facet-value.model';
+import { SearchFilterConfig } from '../../../search-filter-config.model';
+import { SearchService } from '../../../../../core/shared/search/search.service';
+import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
+import { SearchConfigurationService } from '../../../../../core/shared/search/search-configuration.service';
+import { getSucceededRemoteData } from '../../../../../core/shared/operators';
+import { InputSuggestion } from '../../../../input-suggestions/input-suggestions.model';
 import { SearchOptions } from '../../../search-options.model';
-import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
-import { InputSuggestion } from '../../../../shared/input-suggestions/input-suggestions.model';
+import { SEARCH_CONFIG_SERVICE } from '../../../../../+my-dspace-page/my-dspace-page.component';
+import { currentPath } from '../../../../utils/route.utils';
 
 @Component({
   selector: 'ds-search-facet-filter',
@@ -185,7 +186,7 @@ export class SearchFacetFilterComponent implements OnInit, OnDestroy {
    */
   public getSearchLink(): string {
     if (this.inPlaceSearch) {
-      return './';
+      return currentPath(this.router);
     }
     return this.searchService.getSearchLink();
   }
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter-type-decorator.ts b/src/app/shared/search/search-filters/search-filter/search-filter-type-decorator.ts
similarity index 92%
rename from src/app/+search-page/search-filters/search-filter/search-filter-type-decorator.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter-type-decorator.ts
index bcc22be82c..40cff30d41 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter-type-decorator.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter-type-decorator.ts
@@ -1,5 +1,5 @@
 
-import { FilterType } from '../../search-service/filter-type.model';
+import { FilterType } from '../../filter-type.model';
 
 /**
  * Contains the mapping between a facet component and a FilterType
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.actions.ts b/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
similarity index 95%
rename from src/app/+search-page/search-filters/search-filter/search-filter.actions.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
index f7f80eefff..59a1903eb8 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.actions.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.actions.ts
@@ -1,7 +1,7 @@
 import { Action } from '@ngrx/store';
 
-import { type } from '../../../shared/ngrx/type';
-import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
+import { type } from '../../../ngrx/type';
+import { SearchFilterConfig } from '../../search-filter-config.model';
 
 /**
  * For each action type in an action group, make a simple
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.html b/src/app/shared/search/search-filters/search-filter/search-filter.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-filter.component.scss
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-filter.component.scss
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
similarity index 89%
rename from src/app/+search-page/search-filters/search-filter/search-filter.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
index 23c4ab3b53..d1899958b3 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.spec.ts
@@ -5,14 +5,14 @@ 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 './search-filter.service';
-import { SearchService } from '../../search-service/search.service';
+import { SearchFilterService } from '../../../../core/shared/search/search-filter.service';
+import { SearchService } from '../../../../core/shared/search/search.service';
 import { SearchFilterComponent } from './search-filter.component';
-import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
-import { FilterType } from '../../search-service/filter-type.model';
-import { SearchConfigurationService } from '../../search-service/search-configuration.service';
-import { SearchConfigurationServiceStub } from '../../../shared/testing/search-configuration-service-stub';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SearchFilterConfig } from '../../search-filter-config.model';
+import { FilterType } from '../../filter-type.model';
+import { SearchConfigurationService } from '../../../../core/shared/search/search-configuration.service';
+import { SearchConfigurationServiceStub } from '../../../testing/search-configuration-service-stub';
+import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
 
 describe('SearchFilterComponent', () => {
   let comp: SearchFilterComponent;
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
similarity index 88%
rename from src/app/+search-page/search-filters/search-filter/search-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter.component.ts
index bfe9f3be63..a54f593c64 100644
--- a/src/app/+search-page/search-filters/search-filter/search-filter.component.ts
+++ b/src/app/shared/search/search-filters/search-filter/search-filter.component.ts
@@ -3,13 +3,13 @@ import { Component, Inject, Input, OnInit } from '@angular/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { filter, first, map, startWith, switchMap, take } from 'rxjs/operators';
 
-import { SearchFilterConfig } from '../../search-service/search-filter-config.model';
-import { SearchFilterService } from './search-filter.service';
-import { slide } from '../../../shared/animations/slide';
-import { isNotEmpty } from '../../../shared/empty.util';
-import { SearchService } from '../../search-service/search.service';
-import { SearchConfigurationService } from '../../search-service/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SearchFilterConfig } from '../../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';
 
 @Component({
   selector: 'ds-search-filter',
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.reducer.spec.ts b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-filter.reducer.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter.reducer.spec.ts
diff --git a/src/app/+search-page/search-filters/search-filter/search-filter.reducer.ts b/src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-filter.reducer.ts
rename to src/app/shared/search/search-filters/search-filter/search-filter.reducer.ts
diff --git a/src/app/+search-page/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
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.scss
diff --git a/src/app/+search-page/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
similarity index 90%
rename from src/app/+search-page/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component.ts
index b048a9ccd0..3b16f84ea5 100644
--- a/src/app/+search-page/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,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FilterType } from '../../../search-service/filter-type.model';
+import { FilterType } from '../../../filter-type.model';
 import { renderFacetFor } from '../search-filter-type-decorator';
 import {
   facetLoad,
diff --git a/src/app/+search-page/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
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.html
diff --git a/src/app/+search-page/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
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
diff --git a/src/app/+search-page/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
similarity index 79%
rename from src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
rename to src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.spec.ts
index 98b4a04e3d..530b4e6b71 100644
--- a/src/app/+search-page/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
@@ -2,25 +2,24 @@ import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../search-filter.service';
-import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { FilterType } from '../../../search-service/filter-type.model';
-import { FacetValue } from '../../../search-service/facet-value.model';
+import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
+import { SearchFilterConfig } from '../../../search-filter-config.model';
+import { FilterType } from '../../../filter-type.model';
+import { FacetValue } from '../../../facet-value.model';
 import { FormsModule } from '@angular/forms';
 import { of as observableOf } from 'rxjs'
-import { SearchService } from '../../../search-service/search.service';
-import { SearchServiceStub } from '../../../../shared/testing/search-service-stub';
-import { RemoteData } from '../../../../core/data/remote-data';
-import { PaginatedList } from '../../../../core/data/paginated-list';
-import { RouterStub } from '../../../../shared/testing/router-stub';
+import { SearchService } from '../../../../../core/shared/search/search.service';
+import { SearchServiceStub } from '../../../../testing/search-service-stub';
+import { PaginatedList } from '../../../../../core/data/paginated-list';
+import { RouterStub } from '../../../../testing/router-stub';
 import { Router } from '@angular/router';
-import { PageInfo } from '../../../../core/shared/page-info.model';
+import { PageInfo } from '../../../../../core/shared/page-info.model';
 import { SearchRangeFilterComponent } from './search-range-filter.component';
-import { RouteService } from '../../../../core/services/route.service';
-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 '../../../../shared/testing/search-configuration-service-stub';
-import { createSuccessfulRemoteDataObject$ } from '../../../../shared/testing/utils';
+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 '../../../../testing/utils';
+import { RouteService } from '../../../../../core/services/route.service';
 
 describe('SearchRangeFilterComponent', () => {
   let comp: SearchRangeFilterComponent;
diff --git a/src/app/+search-page/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
similarity index 83%
rename from src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.ts
index 5ac59b65f8..b289d5dd61 100644
--- a/src/app/+search-page/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
@@ -2,22 +2,19 @@ import { 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 { RemoteDataBuildService } from '../../../../core/cache/builders/remote-data-build.service';
-import { FilterType } from '../../../search-service/filter-type.model';
+import { RemoteDataBuildService } from '../../../../../core/cache/builders/remote-data-build.service';
+import { FilterType } from '../../../filter-type.model';
 import { renderFacetFor } from '../search-filter-type-decorator';
-import {
-  facetLoad,
-  SearchFacetFilterComponent
-} from '../search-facet-filter/search-facet-filter.component';
-import { SearchFilterConfig } from '../../../search-service/search-filter-config.model';
-import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../search-filter.service';
-import { SearchService } from '../../../search-service/search.service';
+import { facetLoad, SearchFacetFilterComponent } from '../search-facet-filter/search-facet-filter.component';
+import { SearchFilterConfig } from '../../../search-filter-config.model';
+import { FILTER_CONFIG, IN_PLACE_SEARCH, SearchFilterService } from '../../../../../core/shared/search/search-filter.service';
+import { SearchService } from '../../../../../core/shared/search/search.service';
 import { Router } from '@angular/router';
 import * as moment from 'moment';
-import { RouteService } from '../../../../core/services/route.service';
-import { hasValue } from '../../../../shared/empty.util';
-import { SearchConfigurationService } from '../../../search-service/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../../+my-dspace-page/my-dspace-page.component';
+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';
 
 /**
  * The suffix for a range filters' minimum in the frontend URL
diff --git a/src/app/+search-page/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
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.html
rename to src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.html
diff --git a/src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.scss b/src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
similarity index 100%
rename from src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
rename to src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.scss
diff --git a/src/app/+search-page/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
similarity index 92%
rename from src/app/+search-page/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
rename to src/app/shared/search/search-filters/search-filter/search-text-filter/search-text-filter.component.ts
index fd14d6d3de..678cbbfdd5 100644
--- a/src/app/+search-page/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,5 +1,5 @@
 import { Component, OnInit } from '@angular/core';
-import { FilterType } from '../../../search-service/filter-type.model';
+import { FilterType } from '../../../filter-type.model';
 import {
   facetLoad,
   SearchFacetFilterComponent
diff --git a/src/app/+search-page/search-filters/search-filters.component.html b/src/app/shared/search/search-filters/search-filters.component.html
similarity index 100%
rename from src/app/+search-page/search-filters/search-filters.component.html
rename to src/app/shared/search/search-filters/search-filters.component.html
diff --git a/src/app/shared/search/search-filters/search-filters.component.scss b/src/app/shared/search/search-filters/search-filters.component.scss
new file mode 100644
index 0000000000..b5b2816e89
--- /dev/null
+++ b/src/app/shared/search/search-filters/search-filters.component.scss
@@ -0,0 +1,2 @@
+@import '../../../../styles/variables';
+@import '../../../../styles/mixins';
\ No newline at end of file
diff --git a/src/app/+search-page/search-filters/search-filters.component.spec.ts b/src/app/shared/search/search-filters/search-filters.component.spec.ts
similarity index 86%
rename from src/app/+search-page/search-filters/search-filters.component.spec.ts
rename to src/app/shared/search/search-filters/search-filters.component.spec.ts
index 030702d93e..4191106a37 100644
--- a/src/app/+search-page/search-filters/search-filters.component.spec.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.spec.ts
@@ -4,12 +4,12 @@ import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
-import { SearchFilterService } from './search-filter/search-filter.service';
+import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
 import { SearchFiltersComponent } from './search-filters.component';
-import { SearchService } from '../search-service/search.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { of as observableOf } from 'rxjs';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service-stub';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SearchConfigurationServiceStub } from '../../testing/search-configuration-service-stub';
 
 describe('SearchFiltersComponent', () => {
   let comp: SearchFiltersComponent;
diff --git a/src/app/+search-page/search-filters/search-filters.component.ts b/src/app/shared/search/search-filters/search-filters.component.ts
similarity index 71%
rename from src/app/+search-page/search-filters/search-filters.component.ts
rename to src/app/shared/search/search-filters/search-filters.component.ts
index 69bbb6234b..78c40501e6 100644
--- a/src/app/+search-page/search-filters/search-filters.component.ts
+++ b/src/app/shared/search/search-filters/search-filters.component.ts
@@ -1,15 +1,17 @@
 import { Component, Inject, Input, OnInit } from '@angular/core';
 
 import { Observable } from 'rxjs';
-import { map, switchMap } from 'rxjs/operators';
+import { map, switchMap, tap } from 'rxjs/operators';
 
-import { SearchService } from '../search-service/search.service';
-import { RemoteData } from '../../core/data/remote-data';
-import { SearchFilterConfig } from '../search-service/search-filter-config.model';
-import { SearchConfigurationService } from '../search-service/search-configuration.service';
-import { SearchFilterService } from './search-filter/search-filter.service';
-import { getSucceededRemoteData } from '../../core/shared/operators';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { SearchFilterConfig } from '../search-filter-config.model';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
+import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
+import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { currentPath } from '../../utils/route.utils';
+import { Router } from '@angular/router';
 
 @Component({
   selector: 'ds-search-filters',
@@ -51,14 +53,13 @@ export class SearchFiltersComponent implements OnInit {
   constructor(
     private searchService: SearchService,
     private filterService: SearchFilterService,
+    private router: Router,
     @Inject(SEARCH_CONFIG_SERVICE) private searchConfigService: SearchConfigurationService) {
-
   }
 
   ngOnInit(): void {
-
     this.filters = this.searchConfigService.searchOptions.pipe(
-      switchMap((options) => this.searchService.getConfig(options.scope, options.configuration).pipe(getSucceededRemoteData()))
+      switchMap((options) => this.searchService.getConfig(options.scope, options.configuration).pipe(getSucceededRemoteData())),
     );
 
     this.clearParams = this.searchConfigService.getCurrentFrontendFilters().pipe(map((filters) => {
@@ -73,7 +74,7 @@ export class SearchFiltersComponent implements OnInit {
    */
   getSearchLink(): string {
     if (this.inPlaceSearch) {
-      return './';
+      return currentPath(this.router);
     }
     return this.searchService.getSearchLink();
   }
@@ -84,5 +85,4 @@ export class SearchFiltersComponent implements OnInit {
   trackUpdate(index, config: SearchFilterConfig) {
     return config ? config.name : undefined;
   }
-
 }
diff --git a/src/app/+search-page/search-labels/search-label/search-label.component.html b/src/app/shared/search/search-labels/search-label/search-label.component.html
similarity index 100%
rename from src/app/+search-page/search-labels/search-label/search-label.component.html
rename to src/app/shared/search/search-labels/search-label/search-label.component.html
diff --git a/src/app/+search-page/search-labels/search-label/search-label.component.spec.ts b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts
similarity index 83%
rename from src/app/+search-page/search-labels/search-label/search-label.component.spec.ts
rename to src/app/shared/search/search-labels/search-label/search-label.component.spec.ts
index a2603b7b8b..5de87be3bc 100644
--- a/src/app/+search-page/search-labels/search-label/search-label.component.spec.ts
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.spec.ts
@@ -4,13 +4,13 @@ import { TranslateModule } from '@ngx-translate/core';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { FormsModule } from '@angular/forms';
 import { Observable, of as observableOf } from 'rxjs';
-import { Params } from '@angular/router';
+import { Params, Router } from '@angular/router';
 import { SearchLabelComponent } from './search-label.component';
-import { ObjectKeysPipe } from '../../../shared/utils/object-keys-pipe';
-import { SearchService } from '../../search-service/search.service';
-import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
-import { SearchServiceStub } from '../../../shared/testing/search-service-stub';
-import { SearchConfigurationServiceStub } from '../../../shared/testing/search-configuration-service-stub';
+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';
 
 describe('SearchLabelComponent', () => {
   let comp: SearchLabelComponent;
@@ -39,7 +39,8 @@ describe('SearchLabelComponent', () => {
       declarations: [SearchLabelComponent, ObjectKeysPipe],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
-        { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() }
+        { provide: SEARCH_CONFIG_SERVICE, useValue: new SearchConfigurationServiceStub() },
+        { provide: Router, useValue: {}}
         // { provide: SearchConfigurationService, useValue: {getCurrentFrontendFilters : () =>  observableOf({})} }
       ],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/+search-page/search-labels/search-label/search-label.component.ts b/src/app/shared/search/search-labels/search-label/search-label.component.ts
similarity index 84%
rename from src/app/+search-page/search-labels/search-label/search-label.component.ts
rename to src/app/shared/search/search-labels/search-label/search-label.component.ts
index 2f44f91a35..956b5b81de 100644
--- a/src/app/+search-page/search-labels/search-label/search-label.component.ts
+++ b/src/app/shared/search/search-labels/search-label/search-label.component.ts
@@ -1,9 +1,10 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { Observable } from 'rxjs';
-import { Params } from '@angular/router';
-import { SearchService } from '../../search-service/search.service';
+import { Params, Router } from '@angular/router';
 import { map } from 'rxjs/operators';
-import { hasValue, isNotEmpty } from '../../../shared/empty.util';
+import { hasValue, isNotEmpty } from '../../../empty.util';
+import { SearchService } from '../../../../core/shared/search/search.service';
+import { currentPath } from '../../../utils/route.utils';
 
 @Component({
   selector: 'ds-search-label',
@@ -25,7 +26,8 @@ export class SearchLabelComponent implements OnInit {
    * Initialize the instance variable
    */
   constructor(
-    private searchService: SearchService) {
+    private searchService: SearchService,
+    private router: Router) {
   }
 
   ngOnInit(): void {
@@ -55,7 +57,7 @@ export class SearchLabelComponent implements OnInit {
    */
   private getSearchLink(): string {
     if (this.inPlaceSearch) {
-      return './';
+      return currentPath(this.router);
     }
     return this.searchService.getSearchLink();
   }
diff --git a/src/app/shared/search/search-labels/search-labels.component.html b/src/app/shared/search/search-labels/search-labels.component.html
new file mode 100644
index 0000000000..f6af072c51
--- /dev/null
+++ b/src/app/shared/search/search-labels/search-labels.component.html
@@ -0,0 +1,5 @@
+<div class="labels">
+    <ng-container *ngFor="let key of ((appliedFilters | async) | dsObjectKeys)">
+        <ds-search-label *ngFor="let value of (appliedFilters | async)[key]" [inPlaceSearch]="inPlaceSearch" [key]="key" [value]="value" [appliedFilters]="appliedFilters"></ds-search-label>
+    </ng-container>
+</div>
diff --git a/src/app/+search-page/search-labels/search-labels.component.scss b/src/app/shared/search/search-labels/search-labels.component.scss
similarity index 100%
rename from src/app/+search-page/search-labels/search-labels.component.scss
rename to src/app/shared/search/search-labels/search-labels.component.scss
diff --git a/src/app/+search-page/search-labels/search-labels.component.spec.ts b/src/app/shared/search/search-labels/search-labels.component.spec.ts
similarity index 83%
rename from src/app/+search-page/search-labels/search-labels.component.spec.ts
rename to src/app/shared/search/search-labels/search-labels.component.spec.ts
index 7984805206..cba4b266b9 100644
--- a/src/app/+search-page/search-labels/search-labels.component.spec.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.spec.ts
@@ -2,13 +2,14 @@ import { SearchLabelsComponent } from './search-labels.component';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { TranslateModule } from '@ngx-translate/core';
-import { SearchService } from '../search-service/search.service';
 import { ChangeDetectionStrategy, NO_ERRORS_SCHEMA } from '@angular/core';
 import { FormsModule } from '@angular/forms';
-import { SearchServiceStub } from '../../shared/testing/search-service-stub';
 import { of as observableOf } from 'rxjs';
-import { ObjectKeysPipe } from '../../shared/utils/object-keys-pipe';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ObjectKeysPipe } from '../../utils/object-keys-pipe';
+import { SearchServiceStub } from '../../testing/search-service-stub';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
 
 describe('SearchLabelsComponent', () => {
   let comp: SearchLabelsComponent;
@@ -30,7 +31,7 @@ describe('SearchLabelsComponent', () => {
 
   beforeEach(async(() => {
     TestBed.configureTestingModule({
-      imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule],
+      imports: [TranslateModule.forRoot(), NoopAnimationsModule, FormsModule, RouterTestingModule],
       declarations: [SearchLabelsComponent, ObjectKeysPipe],
       providers: [
         { provide: SearchService, useValue: new SearchServiceStub(searchLink) },
diff --git a/src/app/+search-page/search-labels/search-labels.component.ts b/src/app/shared/search/search-labels/search-labels.component.ts
similarity index 62%
rename from src/app/+search-page/search-labels/search-labels.component.ts
rename to src/app/shared/search/search-labels/search-labels.component.ts
index 5f95525bed..154b888269 100644
--- a/src/app/+search-page/search-labels/search-labels.component.ts
+++ b/src/app/shared/search/search-labels/search-labels.component.ts
@@ -1,11 +1,8 @@
-import { Component, Inject, Input, OnInit } from '@angular/core';
-import { SearchService } from '../search-service/search.service';
+import { Component, Inject, Input } from '@angular/core';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
 import { Observable } from 'rxjs';
-import { Params } from '@angular/router';
-import { map } from 'rxjs/operators';
-import { hasValue, isNotEmpty } from '../../shared/empty.util';
-import { SearchConfigurationService } from '../search-service/search-configuration.service';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
+import { Params, Router } from '@angular/router';
+import { SearchConfigurationService } from '../../../core/shared/search/search-configuration.service';
 
 @Component({
   selector: 'ds-search-labels',
@@ -31,6 +28,7 @@ export class SearchLabelsComponent {
    * Initialize the instance variable
    */
   constructor(
+    protected router: Router,
     @Inject(SEARCH_CONFIG_SERVICE) public searchConfigService: SearchConfigurationService) {
     this.appliedFilters = this.searchConfigService.getCurrentFrontendFilters();
   }
diff --git a/src/app/+search-page/search-options.model.spec.ts b/src/app/shared/search/search-options.model.spec.ts
similarity index 93%
rename from src/app/+search-page/search-options.model.spec.ts
rename to src/app/shared/search/search-options.model.spec.ts
index a0ef2b31dd..3b047b578f 100644
--- a/src/app/+search-page/search-options.model.spec.ts
+++ b/src/app/shared/search/search-options.model.spec.ts
@@ -1,7 +1,7 @@
 import { PaginatedSearchOptions } from './paginated-search-options.model';
 import { SearchOptions } from './search-options.model';
 import { SearchFilter } from './search-filter.model';
-import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
 
 describe('SearchOptions', () => {
   let options: PaginatedSearchOptions;
diff --git a/src/app/+search-page/search-options.model.ts b/src/app/shared/search/search-options.model.ts
similarity index 89%
rename from src/app/+search-page/search-options.model.ts
rename to src/app/shared/search/search-options.model.ts
index 4117c13347..4dc92c32f4 100644
--- a/src/app/+search-page/search-options.model.ts
+++ b/src/app/shared/search/search-options.model.ts
@@ -1,9 +1,9 @@
-import { isNotEmpty } from '../shared/empty.util';
-import { URLCombiner } from '../core/url-combiner/url-combiner';
+import { isNotEmpty } from '../empty.util';
+import { URLCombiner } from '../../core/url-combiner/url-combiner';
 import 'core-js/library/fn/object/entries';
 import { SearchFilter } from './search-filter.model';
-import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
-import { ViewMode } from '../core/shared/view-mode.model';
+import { DSpaceObjectType } from '../../core/shared/dspace-object-type.model';
+import { ViewMode } from '../../core/shared/view-mode.model';
 
 /**
  * This model class represents all parameters needed to request information about a certain search request
diff --git a/src/app/+search-page/search-service/search-query-response.model.ts b/src/app/shared/search/search-query-response.model.ts
similarity index 95%
rename from src/app/+search-page/search-service/search-query-response.model.ts
rename to src/app/shared/search/search-query-response.model.ts
index bca6e644fc..da15a60631 100644
--- a/src/app/+search-page/search-service/search-query-response.model.ts
+++ b/src/app/shared/search/search-query-response.model.ts
@@ -1,6 +1,6 @@
 import { autoserialize, autoserializeAs } from 'cerialize';
 import { PageInfo } from '../../core/shared/page-info.model';
-import { NormalizedSearchResult } from '../normalized-search-result.model';
+import { NormalizedSearchResult } from './normalized-search-result.model';
 
 /**
  * Class representing the response returned by the server when performing a search request
diff --git a/src/app/+search-page/search-service/search-result-element-decorator.ts b/src/app/shared/search/search-result-element-decorator.ts
similarity index 88%
rename from src/app/+search-page/search-service/search-result-element-decorator.ts
rename to src/app/shared/search/search-result-element-decorator.ts
index 62887387c5..f23ee9adde 100644
--- a/src/app/+search-page/search-service/search-result-element-decorator.ts
+++ b/src/app/shared/search/search-result-element-decorator.ts
@@ -1,6 +1,6 @@
 import { GenericConstructor } from '../../core/shared/generic-constructor';
-import { ListableObject } from '../../shared/object-collection/shared/listable-object.model';
-import { hasNoValue, isNull } from '../../shared/empty.util';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { hasNoValue, isNull } from '../empty.util';
 
 /**
  * Contains the mapping between a search result component and a DSpaceObject
diff --git a/src/app/shared/search/search-result.model.ts b/src/app/shared/search/search-result.model.ts
new file mode 100644
index 0000000000..8d26395021
--- /dev/null
+++ b/src/app/shared/search/search-result.model.ts
@@ -0,0 +1,29 @@
+import { DSpaceObject } from '../../core/shared/dspace-object.model';
+import { MetadataMap } from '../../core/shared/metadata.models';
+import { ListableObject } from '../object-collection/shared/listable-object.model';
+import { excludeFromEquals, fieldsForEquals } from '../../core/utilities/equals.decorators';
+import { GenericConstructor } from '../../core/shared/generic-constructor';
+
+/**
+ * Represents a search result object of a certain (<T>) DSpaceObject
+ */
+export class SearchResult<T extends DSpaceObject> extends ListableObject {
+  /**
+   * The DSpaceObject that was found
+   */
+  @fieldsForEquals('uuid')
+  indexableObject: T;
+
+  /**
+   * The metadata that was used to find this item, hithighlighted
+   */
+  @excludeFromEquals
+  hitHighlights: MetadataMap;
+
+  /**
+   * Method that returns as which type of object this object should be rendered
+   */
+  getRenderTypes(): Array<string | GenericConstructor<ListableObject>> {
+    return [this.constructor as GenericConstructor<ListableObject>];
+  }
+}
diff --git a/src/app/shared/search/search-results/search-results.component.html b/src/app/shared/search/search-results/search-results.component.html
new file mode 100644
index 0000000000..ab1e96c58f
--- /dev/null
+++ b/src/app/shared/search/search-results/search-results.component.html
@@ -0,0 +1,29 @@
+<h2 *ngIf="!disableHeader">{{ (configuration ? configuration + '.search.results.head' : 'search.results.head') | translate }}</h2>
+<div *ngIf="searchResults?.hasSucceeded && !searchResults?.isLoading && searchResults?.payload?.page.length > 0" @fadeIn>
+    <ds-viewable-collection
+            [config]="searchConfig.pagination"
+            [sortConfig]="searchConfig.sort"
+            [objects]="searchResults"
+            [hideGear]="true"
+            [selectable]="selectable"
+            [selectionConfig]="selectionConfig"
+            [context]="context"
+            (deselectObject)="deselectObject.emit($event)"
+            (selectObject)="selectObject.emit($event)"
+            >
+    </ds-viewable-collection>
+</div>
+<ds-loading
+        *ngIf="hasNoValue(searchResults) || hasNoValue(searchResults.payload) || searchResults.isLoading"
+        message="{{'loading.search-results' | translate}}"></ds-loading>
+<ds-error
+        *ngIf="searchResults?.hasFailed && (!searchResults?.error || searchResults?.error?.statusCode != 400)"
+        message="{{'error.search-results' | translate}}"></ds-error>
+<div *ngIf="searchResults?.payload?.page.length == 0 || searchResults?.error?.statusCode == 400">
+    {{ 'search.results.no-results' | translate }}
+    <a [routerLink]="['/search']"
+       [queryParams]="{ query: surroundStringWithQuotes(searchConfig?.query) }"
+       queryParamsHandling="merge">
+        {{"search.results.no-results-link" | translate}}
+    </a>
+</div> 
diff --git a/src/app/+search-page/search-results/search-results.component.spec.ts b/src/app/shared/search/search-results/search-results.component.spec.ts
similarity index 97%
rename from src/app/+search-page/search-results/search-results.component.spec.ts
rename to src/app/shared/search/search-results/search-results.component.spec.ts
index 6eb48bb037..d2c02717c9 100644
--- a/src/app/+search-page/search-results/search-results.component.spec.ts
+++ b/src/app/shared/search/search-results/search-results.component.spec.ts
@@ -2,11 +2,11 @@ import { ComponentFixture, TestBed, async, tick, fakeAsync } from '@angular/core
 import { By } from '@angular/platform-browser';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 import { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
-import { ResourceType } from '../../core/shared/resource-type';
-import { Community } from '../../core/shared/community.model';
+import { ResourceType } from '../../../core/shared/resource-type';
+import { Community } from '../../../core/shared/community.model';
 import { TranslateModule } from '@ngx-translate/core';
 import { SearchResultsComponent } from './search-results.component';
-import { QueryParamsDirectiveStub } from '../../shared/testing/query-params-directive-stub';
+import { QueryParamsDirectiveStub } from '../../testing/query-params-directive-stub';
 
 describe('SearchResultsComponent', () => {
   let comp: SearchResultsComponent;
diff --git a/src/app/+search-page/search-results/search-results.component.ts b/src/app/shared/search/search-results/search-results.component.ts
similarity index 57%
rename from src/app/+search-page/search-results/search-results.component.ts
rename to src/app/shared/search/search-results/search-results.component.ts
index 24c973e296..f245b5f9ae 100644
--- a/src/app/+search-page/search-results/search-results.component.ts
+++ b/src/app/shared/search/search-results/search-results.component.ts
@@ -1,14 +1,16 @@
-import { Component, Input } from '@angular/core';
-import { RemoteData } from '../../core/data/remote-data';
-import { DSpaceObject } from '../../core/shared/dspace-object.model';
-import { fadeIn, fadeInOut } from '../../shared/animations/fade';
+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 { SearchOptions } from '../search-options.model';
 import { SearchResult } from '../search-result.model';
-import { PaginatedList } from '../../core/data/paginated-list';
-import { hasNoValue, isNotEmpty } from '../../shared/empty.util';
-import { SortOptions } from '../../core/cache/models/sort-options.model';
-import { ViewMode } from '../../core/shared/view-mode.model';
-import { CollectionElementLinkType } from '../../shared/object-collection/collection-element-link.type';
+import { PaginatedList } from '../../../core/data/paginated-list';
+import { hasNoValue, isNotEmpty } from '../../empty.util';
+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 { Context } from '../../../core/shared/context.model';
 
 @Component({
   selector: 'ds-search-results',
@@ -61,6 +63,16 @@ export class SearchResultsComponent {
    */
   @Input() disableHeader = false;
 
+  @Input() selectable = false;
+
+  @Input() context: Context;
+
+  @Input() selectionConfig: {repeatable: boolean, listId: string};
+
+  @Output() deselectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
+  @Output() selectObject: EventEmitter<ListableObject> = new EventEmitter<ListableObject>();
+
   /**
    * Method to change the given string by surrounding it by quotes if not already present.
    */
diff --git a/src/app/shared/search/search-settings/search-settings.component.html b/src/app/shared/search/search-settings/search-settings.component.html
new file mode 100644
index 0000000000..f6806e6843
--- /dev/null
+++ b/src/app/shared/search/search-settings/search-settings.component.html
@@ -0,0 +1,18 @@
+<ng-container *ngVar="(searchOptions$ | async) as config">
+    <h3>{{ 'search.sidebar.settings.title' | translate}}</h3>
+    <div class="result-order-settings">
+    <ds-sidebar-dropdown
+            *ngIf="config?.sort"
+            [id]="'search-sidebar-sort'"
+            [label]="'search.sidebar.settings.sort-by'"
+            (change)="reloadOrder($event)"
+    >
+        <option *ngFor="let sortOption of searchOptionPossibilities"
+                [value]="sortOption.field + ',' + sortOption.direction.toString()"
+                [selected]="sortOption.field === config?.sort.field && sortOption.direction === (config?.sort.direction)? 'selected': null">
+            {{'sorting.' + sortOption.field + '.' + sortOption.direction | translate}}
+        </option>
+    </ds-sidebar-dropdown>
+    </div>
+    <ds-page-size-selector></ds-page-size-selector>
+</ng-container>
\ No newline at end of file
diff --git a/src/app/shared/search/search-settings/search-settings.component.scss b/src/app/shared/search/search-settings/search-settings.component.scss
new file mode 100644
index 0000000000..cd18456888
--- /dev/null
+++ b/src/app/shared/search/search-settings/search-settings.component.scss
@@ -0,0 +1,3 @@
+.setting-option {
+    border: 1px solid map-get($theme-colors, light);
+}
diff --git a/src/app/+search-page/search-settings/search-settings.component.spec.ts b/src/app/shared/search/search-settings/search-settings.component.spec.ts
similarity index 66%
rename from src/app/+search-page/search-settings/search-settings.component.spec.ts
rename to src/app/shared/search/search-settings/search-settings.component.spec.ts
index e0fbc84deb..a2f59d19e0 100644
--- a/src/app/+search-page/search-settings/search-settings.component.spec.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.spec.ts
@@ -1,29 +1,29 @@
-import { SearchService } from '../search-service/search.service';
+import { SearchService } from '../../../core/shared/search/search.service';
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { SearchSettingsComponent } from './search-settings.component';
 import { of as observableOf } from 'rxjs';
-import { PaginationComponentOptions } from '../../shared/pagination/pagination-component-options.model';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+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 { SidebarService } from '../../shared/sidebar/sidebar.service';
 import { NO_ERRORS_SCHEMA } from '@angular/core';
-import { EnumKeysPipe } from '../../shared/utils/enum-keys-pipe';
+import { EnumKeysPipe } from '../../utils/enum-keys-pipe';
 import { By } from '@angular/platform-browser';
-import { SearchFilterService } from '../search-filters/search-filter/search-filter.service';
-import { VarDirective } from '../../shared/utils/var.directive';
+import { SearchFilterService } from '../../../core/shared/search/search-filter.service';
+import { VarDirective } from '../../utils/var.directive';
 import { take } from 'rxjs/operators';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+import { SidebarService } from '../../sidebar/sidebar.service';
 
 describe('SearchSettingsComponent', () => {
 
-  let comp:SearchSettingsComponent;
-  let fixture:ComponentFixture<SearchSettingsComponent>;
-  let searchServiceObject:SearchService;
+  let comp: SearchSettingsComponent;
+  let fixture: ComponentFixture<SearchSettingsComponent>;
+  let searchServiceObject: SearchService;
 
-  let pagination:PaginationComponentOptions;
-  let sort:SortOptions;
+  let pagination: PaginationComponentOptions;
+  let sort: SortOptions;
   let mockResults;
   let searchServiceStub;
 
@@ -43,7 +43,7 @@ describe('SearchSettingsComponent', () => {
     sort = new SortOptions('score', SortDirection.DESC);
     mockResults = ['test', 'data'];
     searchServiceStub = {
-      searchOptions: {pagination: pagination, sort: sort},
+      searchOptions: { pagination: pagination, sort: sort },
       search: () => mockResults,
     };
 
@@ -73,9 +73,9 @@ describe('SearchSettingsComponent', () => {
       imports: [TranslateModule.forRoot(), RouterTestingModule.withRoutes([])],
       declarations: [SearchSettingsComponent, EnumKeysPipe, VarDirective],
       providers: [
-        {provide: SearchService, useValue: searchServiceStub},
+        { provide: SearchService, useValue: searchServiceStub },
 
-        {provide: ActivatedRoute, useValue: activatedRouteStub},
+        { provide: ActivatedRoute, useValue: activatedRouteStub },
         {
           provide: SidebarService,
           useValue: sidebarService,
@@ -88,8 +88,8 @@ describe('SearchSettingsComponent', () => {
           provide: SEARCH_CONFIG_SERVICE,
           useValue: {
             paginatedSearchOptions: observableOf(paginatedSearchOptions),
-            getCurrentScope: observableOf('test-id'),
-          },
+            getCurrentScope: observableOf('test-id')
+          }
         },
       ],
       schemas: [NO_ERRORS_SCHEMA],
@@ -103,7 +103,6 @@ describe('SearchSettingsComponent', () => {
     // SearchPageComponent test instance
     fixture.detectChanges();
     searchServiceObject = (comp as any).service;
-    spyOn(comp, 'reloadRPP');
     spyOn(comp, 'reloadOrder');
     spyOn(searchServiceObject, 'search').and.callThrough();
 
@@ -120,16 +119,14 @@ describe('SearchSettingsComponent', () => {
     });
   });
 
-  it('it should show the size settings with the respective selectable options', (done) => {
+  it('it should show the size settings', (done) => {
     (comp as any).searchOptions$.pipe(take(1)).subscribe((options) => {
         fixture.detectChanges();
-        const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
+        const pageSizeSetting = fixture.debugElement.query(By.css('page-size-settings'));
         expect(pageSizeSetting).toBeDefined();
-        const childElements = pageSizeSetting.queryAll(By.css('option'));
-        expect(childElements.length).toEqual(options.pagination.pageSizeOptions.length);
         done();
-      },
-    );
+      }
+    )
   });
 
   it('should have the proper order value selected by default', (done) => {
@@ -141,15 +138,4 @@ describe('SearchSettingsComponent', () => {
       done();
     });
   });
-
-  it('should have the proper rpp value selected by default', (done) => {
-    (comp as any).searchOptions$.pipe(take(1)).subscribe((options) => {
-      fixture.detectChanges();
-      const pageSizeSetting = fixture.debugElement.query(By.css('div.page-size-settings'));
-      const childElementToBeSelected = pageSizeSetting.query(By.css('option[value="10"][selected="selected"]'));
-      expect(childElementToBeSelected).toBeDefined();
-      done();
-    });
-  });
-
 });
diff --git a/src/app/+search-page/search-settings/search-settings.component.ts b/src/app/shared/search/search-settings/search-settings.component.ts
similarity index 54%
rename from src/app/+search-page/search-settings/search-settings.component.ts
rename to src/app/shared/search/search-settings/search-settings.component.ts
index aac861c64f..9117945cc5 100644
--- a/src/app/+search-page/search-settings/search-settings.component.ts
+++ b/src/app/shared/search/search-settings/search-settings.component.ts
@@ -1,11 +1,12 @@
 import { Component, Inject, Input, OnInit } from '@angular/core';
-import { SearchService } from '../search-service/search.service';
-import { SortDirection, SortOptions } from '../../core/cache/models/sort-options.model';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { SortDirection, SortOptions } from '../../../core/cache/models/sort-options.model';
 import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { PaginatedSearchOptions } from '../paginated-search-options.model';
 import { Observable } from 'rxjs';
-import { SearchConfigurationService } from '../search-service/search-configuration.service';
-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';
+import { currentPath } from '../../utils/route.utils';
 
 @Component({
   selector: 'ds-search-settings',
@@ -17,12 +18,6 @@ import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.comp
  * This component represents the part of the search sidebar that contains the general search settings.
  */
 export class SearchSettingsComponent implements OnInit {
-
-  /**
-   * True when the search component should show results on the current page
-   */
-  @Input() inPlaceSearch;
-
   /**
    * The configuration for the current paginated search results
    */
@@ -46,22 +41,6 @@ export class SearchSettingsComponent implements OnInit {
     this.searchOptions$ = this.searchConfigurationService.paginatedSearchOptions;
   }
 
-  /**
-   * Method to change the current page size (results per page)
-   * @param {Event} event Change event containing the new page size value
-   */
-  reloadRPP(event: Event) {
-    const value = (event.target as HTMLInputElement).value;
-    const navigationExtras: NavigationExtras = {
-      queryParams: {
-        pageSize: value,
-        page: 1
-      },
-      queryParamsHandling: 'merge'
-    };
-    this.router.navigate(this.getSearchLinkParts(), navigationExtras);
-  }
-
   /**
    * Method to change the current sort field and direction
    * @param {Event} event Change event containing the sort direction and sort field
@@ -76,26 +55,6 @@ export class SearchSettingsComponent implements OnInit {
       },
       queryParamsHandling: 'merge'
     };
-    this.router.navigate(this.getSearchLinkParts(), navigationExtras);
-  }
-
-  /**
-   * @returns {string} The base path to the search page, or the current page when inPlaceSearch is true
-   */
-  public getSearchLink(): string {
-    if (this.inPlaceSearch) {
-      return './';
-    }
-    return this.service.getSearchLink();
-  }
-
-  /**
-   * @returns {string[]} The base path to the search page, or the current page when inPlaceSearch is true, split in separate pieces
-   */
-  public getSearchLinkParts(): string[] {
-    if (this.service) {
-      return [];
-    }
-    return this.getSearchLink().split('/');
+    this.router.navigate([], navigationExtras);
   }
 }
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.html b/src/app/shared/search/search-sidebar/search-sidebar.component.html
similarity index 81%
rename from src/app/+search-page/search-sidebar/search-sidebar.component.html
rename to src/app/shared/search/search-sidebar/search-sidebar.component.html
index 7a5857fcff..638aed7834 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.component.html
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.html
@@ -8,11 +8,11 @@
         </button>
     </div>
     <div id="search-sidebar-content">
-        <ds-view-mode-switch [viewModeList]="viewModeList" class="d-none d-md-block"></ds-view-mode-switch>
+        <ds-view-mode-switch *ngIf="showViewModes" [viewModeList]="viewModeList" class="d-none d-md-block"></ds-view-mode-switch>
         <div class="sidebar-content">
             <ds-search-switch-configuration [inPlaceSearch]="inPlaceSearch" *ngIf="configurationList" [configurationList]="configurationList"></ds-search-switch-configuration>
             <ds-search-filters [inPlaceSearch]="inPlaceSearch"></ds-search-filters>
-            <ds-search-settings [inPlaceSearch]="inPlaceSearch"></ds-search-settings>
+            <ds-search-settings></ds-search-settings>
         </div>
     </div>
 </div>
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.scss b/src/app/shared/search/search-sidebar/search-sidebar.component.scss
similarity index 100%
rename from src/app/+search-page/search-sidebar/search-sidebar.component.scss
rename to src/app/shared/search/search-sidebar/search-sidebar.component.scss
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.spec.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts
similarity index 100%
rename from src/app/+search-page/search-sidebar/search-sidebar.component.spec.ts
rename to src/app/shared/search/search-sidebar/search-sidebar.component.spec.ts
diff --git a/src/app/+search-page/search-sidebar/search-sidebar.component.ts b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
similarity index 93%
rename from src/app/+search-page/search-sidebar/search-sidebar.component.ts
rename to src/app/shared/search/search-sidebar/search-sidebar.component.ts
index 9ee0a74942..42e8a444bc 100644
--- a/src/app/+search-page/search-sidebar/search-sidebar.component.ts
+++ b/src/app/shared/search/search-sidebar/search-sidebar.component.ts
@@ -34,6 +34,11 @@ export class SearchSidebarComponent {
    */
   @Input() viewModeList;
 
+  /**
+   * Whether to show the view mode switch
+   */
+  @Input() showViewModes = true;
+
   /**
    * True when the search component should show results on the current page
    */
diff --git a/src/app/+search-page/search-switch-configuration/search-configuration-option.model.ts b/src/app/shared/search/search-switch-configuration/search-configuration-option.model.ts
similarity index 100%
rename from src/app/+search-page/search-switch-configuration/search-configuration-option.model.ts
rename to src/app/shared/search/search-switch-configuration/search-configuration-option.model.ts
diff --git a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.html b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
similarity index 100%
rename from src/app/+search-page/search-switch-configuration/search-switch-configuration.component.html
rename to src/app/shared/search/search-switch-configuration/search-switch-configuration.component.html
diff --git a/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.scss b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.scss
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.spec.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
similarity index 87%
rename from src/app/+search-page/search-switch-configuration/search-switch-configuration.component.spec.ts
rename to src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
index 602dee33e6..05108905f2 100644
--- a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.spec.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.spec.ts
@@ -6,13 +6,16 @@ import { of as observableOf } from 'rxjs';
 import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
 
 import { SearchSwitchConfigurationComponent } from './search-switch-configuration.component';
-import { MYDSPACE_ROUTE, SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationServiceStub } from '../../shared/testing/search-configuration-service-stub';
-import { MockTranslateLoader } from '../../shared/mocks/mock-translate-loader';
 import { NavigationExtras, Router } from '@angular/router';
-import { RouterStub } from '../../shared/testing/router-stub';
-import { MyDSpaceConfigurationValueType } from '../../+my-dspace-page/my-dspace-configuration-value-type';
-import { SearchService } from '../search-service/search.service';
+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 { MockTranslateLoader } from '../../mocks/mock-translate-loader';
 
 describe('SearchSwitchConfigurationComponent', () => {
 
diff --git a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.ts b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
similarity index 83%
rename from src/app/+search-page/search-switch-configuration/search-switch-configuration.component.ts
rename to src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
index 1ce1bf84ec..73312e072e 100644
--- a/src/app/+search-page/search-switch-configuration/search-switch-configuration.component.ts
+++ b/src/app/shared/search/search-switch-configuration/search-switch-configuration.component.ts
@@ -3,12 +3,13 @@ import { NavigationExtras, Router } from '@angular/router';
 
 import { Subscription } from 'rxjs';
 
-import { hasValue } from '../../shared/empty.util';
-import { SEARCH_CONFIG_SERVICE } from '../../+my-dspace-page/my-dspace-page.component';
-import { SearchConfigurationService } from '../search-service/search-configuration.service';
-import { MyDSpaceConfigurationValueType } from '../../+my-dspace-page/my-dspace-configuration-value-type';
+import { hasValue } from '../../empty.util';
+import { SEARCH_CONFIG_SERVICE } from '../../../+my-dspace-page/my-dspace-page.component';
+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 '../search-service/search.service';
+import { SearchService } from '../../../core/shared/search/search.service';
+import { currentPath } from '../../utils/route.utils';
 
 @Component({
   selector: 'ds-search-switch-configuration',
@@ -87,7 +88,7 @@ export class SearchSwitchConfigurationComponent implements OnDestroy, OnInit {
    */
   public getSearchLink(): string {
     if (this.inPlaceSearch) {
-      return './';
+      return currentPath(this.router);
     }
     return this.searchService.getSearchLink();
   }
diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts
index 56ba345022..89157aeee1 100644
--- a/src/app/shared/shared.module.ts
+++ b/src/app/shared/shared.module.ts
@@ -48,10 +48,7 @@ import { LogOutComponent } from './log-out/log-out.component';
 import { FormComponent } from './form/form.component';
 import { DsDynamicTypeaheadComponent } from './form/builder/ds-dynamic-form-ui/models/typeahead/dynamic-typeahead.component';
 import { DsDynamicScrollableDropdownComponent } from './form/builder/ds-dynamic-form-ui/models/scrollable-dropdown/dynamic-scrollable-dropdown.component';
-import {
-  DsDynamicFormControlContainerComponent,
-  dsDynamicFormControlMapFn
-} from './form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
+import { DsDynamicFormControlContainerComponent, dsDynamicFormControlMapFn } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component';
 import { DsDynamicFormComponent } from './form/builder/ds-dynamic-form-ui/ds-dynamic-form.component';
 import { DYNAMIC_FORM_CONTROL_MAP_FN, DynamicFormsCoreModule } from '@ng-dynamic-forms/core';
 import { DynamicFormsNGBootstrapUIModule } from '@ng-dynamic-forms/ui-ng-bootstrap';
@@ -130,10 +127,34 @@ import { RoleDirective } from './roles/role.directive';
 import { UserMenuComponent } from './auth-nav-menu/user-menu/user-menu.component';
 import { ClaimedTaskActionsReturnToPoolComponent } from './mydspace-actions/claimed-task/return-to-pool/claimed-task-actions-return-to-pool.component';
 import { ItemDetailPreviewFieldComponent } from './object-detail/my-dspace-result-detail-element/item-detail-preview/item-detail-preview-field/item-detail-preview-field.component';
-import { ItemSelectComponent } from './object-select/item-select/item-select.component';
-import { CollectionSelectComponent } from './object-select/collection-select/collection-select.component';
+import { DsDynamicLookupRelationModalComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/dynamic-lookup-relation-modal.component';
+import { SearchResultsComponent } from './search/search-results/search-results.component';
+import { SearchSidebarComponent } from './search/search-sidebar/search-sidebar.component';
+import { SearchSettingsComponent } from './search/search-settings/search-settings.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 { SearchFiltersComponent } from './search/search-filters/search-filters.component';
+import { SearchFilterComponent } from './search/search-filters/search-filter/search-filter.component';
+import { SearchFacetFilterComponent } from './search/search-filters/search-filter/search-facet-filter/search-facet-filter.component';
+import { SearchLabelsComponent } from './search/search-labels/search-labels.component';
+import { SearchFacetFilterWrapperComponent } from './search/search-filters/search-filter/search-facet-filter-wrapper/search-facet-filter-wrapper.component';
+import { SearchRangeFilterComponent } from './search/search-filters/search-filter/search-range-filter/search-range-filter.component';
+import { SearchTextFilterComponent } from './search/search-filters/search-filter/search-text-filter/search-text-filter.component';
+import { SearchHierarchyFilterComponent } from './search/search-filters/search-filter/search-hierarchy-filter/search-hierarchy-filter.component';
+import { SearchBooleanFilterComponent } from './search/search-filters/search-filter/search-boolean-filter/search-boolean-filter.component';
+import { SearchFacetOptionComponent } from './search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component';
+import { SearchFacetSelectedOptionComponent } from './search/search-filters/search-filter/search-facet-filter-options/search-facet-selected-option/search-facet-selected-option.component';
+import { SearchFacetRangeOptionComponent } from './search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component';
+import { SearchSwitchConfigurationComponent } from './search/search-switch-configuration/search-switch-configuration.component';
+import { SearchAuthorityFilterComponent } from './search/search-filters/search-filter/search-authority-filter/search-authority-filter.component';
+import { DsDynamicDisabledComponent } from './form/builder/ds-dynamic-form-ui/models/disabled/dynamic-disabled.component';
+import { DsDynamicLookupRelationSearchTabComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/search-tab/dynamic-lookup-relation-search-tab.component';
+import { DsDynamicLookupRelationSelectionTabComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/selection-tab/dynamic-lookup-relation-selection-tab.component';
+import { PageSizeSelectorComponent } from './page-size-selector/page-size-selector.component';
 import { AbstractTrackableComponent } from './trackable/abstract-trackable.component';
 import { ComcolMetadataComponent } from './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 { PublicationGridElementComponent } from './object-grid/item-grid-element/item-types/publication/publication-grid-element.component';
@@ -144,13 +165,16 @@ import { ListableObjectComponentLoaderComponent } from './object-collection/shar
 import { PublicationSearchResultListElementComponent } from './object-list/search-result-list-element/item-search-result/item-types/publication/publication-search-result-list-element.component';
 import { PublicationSearchResultGridElementComponent } from './object-grid/search-result-grid-element/item-search-result/publication/publication-search-result-grid-element.component';
 import { ListableObjectDirective } from './object-collection/shared/listable-object/listable-object.directive';
-import { CommunitySearchResultGridElementComponent } from './object-grid/search-result-grid-element/community-search-result/community-search-result-grid-element.component';
-import { CollectionSearchResultGridElementComponent } from './object-grid/search-result-grid-element/collection-search-result/collection-search-result-grid-element.component';
+import { SearchLabelComponent } from './search/search-labels/search-label/search-label.component';
 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 { SidebarFilterComponent } from './sidebar/filter/sidebar-filter.component';
 import { SidebarFilterSelectedOptionComponent } from './sidebar/filter/sidebar-filter-selected-option.component';
+import { SelectableListItemControlComponent } from './object-collection/shared/selectable-list-item-control/selectable-list-item-control.component';
+import { DsDynamicLookupRelationExternalSourceTabComponent } from './form/builder/ds-dynamic-form-ui/relation-lookup-modal/external-source-tab/dynamic-lookup-relation-external-source-tab.component';
+import { DragDropModule } from '@angular/cdk/drag-drop';
+import { ExistingMetadataListElementComponent } from './form/builder/ds-dynamic-form-ui/existing-metadata-list-element/existing-metadata-list-element.component';
 
 const MODULES = [
   // Do NOT include UniversalModule, HttpModule, or JsonpModule here
@@ -173,6 +197,7 @@ const MODULES = [
   MomentModule,
   TextMaskModule,
   MenuModule,
+  DragDropModule
 ];
 
 const ROOT_MODULES = [
@@ -212,6 +237,8 @@ const COMPONENTS = [
   DsDynamicFormControlContainerComponent,
   DsDynamicListComponent,
   DsDynamicLookupComponent,
+  DsDynamicDisabledComponent,
+  DsDynamicLookupRelationModalComponent,
   DsDynamicScrollableDropdownComponent,
   DsDynamicTagComponent,
   DsDynamicTypeaheadComponent,
@@ -270,6 +297,29 @@ const COMPONENTS = [
   EditItemSelectorComponent,
   CommunitySearchResultListElementComponent,
   CollectionSearchResultListElementComponent,
+  BrowseByComponent,
+  SearchResultsComponent,
+  SearchSidebarComponent,
+  SearchSettingsComponent,
+  CollectionSearchResultGridElementComponent,
+  CommunitySearchResultGridElementComponent,
+  SearchFiltersComponent,
+  SearchFilterComponent,
+  SearchFacetFilterComponent,
+  SearchLabelsComponent,
+  SearchLabelComponent,
+  SearchFacetFilterComponent,
+  SearchFacetFilterWrapperComponent,
+  SearchRangeFilterComponent,
+  SearchTextFilterComponent,
+  SearchHierarchyFilterComponent,
+  SearchBooleanFilterComponent,
+  SearchFacetOptionComponent,
+  SearchFacetSelectedOptionComponent,
+  SearchFacetRangeOptionComponent,
+  SearchSwitchConfigurationComponent,
+  SearchAuthorityFilterComponent,
+  PageSizeSelectorComponent,
   CommunitySearchResultGridElementComponent,
   CollectionSearchResultGridElementComponent,
   ListableObjectComponentLoaderComponent,
@@ -283,7 +333,9 @@ const COMPONENTS = [
   ItemTypeBadgeComponent,
   ItemSelectComponent,
   CollectionSelectComponent,
-  MetadataRepresentationLoaderComponent
+  MetadataRepresentationLoaderComponent,
+  SelectableListItemControlComponent,
+  ExistingMetadataListElementComponent
 ];
 
 const ENTRY_COMPONENTS = [
@@ -307,6 +359,8 @@ const ENTRY_COMPONENTS = [
   SearchResultGridElementComponent,
   DsDynamicListComponent,
   DsDynamicLookupComponent,
+  DsDynamicDisabledComponent,
+  DsDynamicLookupRelationModalComponent,
   DsDynamicScrollableDropdownComponent,
   DsDynamicTagComponent,
   DsDynamicTypeaheadComponent,
@@ -328,7 +382,22 @@ const ENTRY_COMPONENTS = [
   PlainTextMetadataListElementComponent,
   ItemMetadataListElementComponent,
   MetadataRepresentationListElementComponent,
-  ItemMetadataRepresentationListElementComponent
+  ItemMetadataRepresentationListElementComponent,
+  SearchResultsComponent,
+  CollectionSearchResultGridElementComponent,
+  CommunitySearchResultGridElementComponent,
+  SearchFacetFilterComponent,
+  SearchRangeFilterComponent,
+  SearchTextFilterComponent,
+  SearchHierarchyFilterComponent,
+  SearchBooleanFilterComponent,
+  SearchFacetOptionComponent,
+  SearchFacetSelectedOptionComponent,
+  SearchFacetRangeOptionComponent,
+  SearchAuthorityFilterComponent,
+  DsDynamicLookupRelationSearchTabComponent,
+  DsDynamicLookupRelationSelectionTabComponent,
+  DsDynamicLookupRelationExternalSourceTabComponent
 ];
 
 const SHARED_ITEM_PAGE_COMPONENTS = [
@@ -370,7 +439,8 @@ const DIRECTIVES = [
     ...DIRECTIVES,
     ...ENTRY_COMPONENTS,
     ...SHARED_ITEM_PAGE_COMPONENTS,
-    PublicationSearchResultListElementComponent
+    PublicationSearchResultListElementComponent,
+    ExistingMetadataListElementComponent
   ],
   providers: [
     ...PROVIDERS
diff --git a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts b/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts
index 5c80a9cd87..4f1d2415ae 100644
--- a/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts
+++ b/src/app/shared/sidebar/filter/sidebar-filter-selected-option.component.ts
@@ -10,6 +10,6 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
  * Represents a single selected option in a sidebar filter
  */
 export class SidebarFilterSelectedOptionComponent {
-  @Input() label:string;
-  @Output() click:EventEmitter<any> = new EventEmitter<any>();
+  @Input() label: string;
+  @Output() click: EventEmitter<any> = new EventEmitter<any>();
 }
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.actions.ts b/src/app/shared/sidebar/filter/sidebar-filter.actions.ts
index 2391274489..644bebd949 100644
--- a/src/app/shared/sidebar/filter/sidebar-filter.actions.ts
+++ b/src/app/shared/sidebar/filter/sidebar-filter.actions.ts
@@ -45,7 +45,7 @@ export class FilterInitializeAction extends SidebarFilterAction {
   type = SidebarFilterActionTypes.INITIALIZE;
   initiallyExpanded;
 
-  constructor(name:string, initiallyExpanded:boolean) {
+  constructor(name: string, initiallyExpanded: boolean) {
     super(name);
     this.initiallyExpanded = initiallyExpanded;
   }
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.component.ts b/src/app/shared/sidebar/filter/sidebar-filter.component.ts
index 2a98565639..5a019d41df 100644
--- a/src/app/shared/sidebar/filter/sidebar-filter.component.ts
+++ b/src/app/shared/sidebar/filter/sidebar-filter.component.ts
@@ -15,13 +15,13 @@ import { slide } from '../../animations/slide';
  */
 export class SidebarFilterComponent implements OnInit {
 
-  @Input() name:string;
-  @Input() type:string;
-  @Input() label:string;
+  @Input() name: string;
+  @Input() type: string;
+  @Input() label: string;
   @Input() expanded = true;
   @Input() singleValue = false;
-  @Input() selectedValues:Observable<string[]>;
-  @Output() removeValue:EventEmitter<any> = new EventEmitter<any>();
+  @Input() selectedValues: Observable<string[]>;
+  @Output() removeValue: EventEmitter<any> = new EventEmitter<any>();
 
   /**
    * True when the filter is 100% collapsed in the UI
@@ -31,10 +31,10 @@ export class SidebarFilterComponent implements OnInit {
   /**
    * Emits true when the filter is currently collapsed in the store
    */
-  collapsed$:Observable<boolean>;
+  collapsed$: Observable<boolean>;
 
   constructor(
-    protected filterService:SidebarFilterService,
+    protected filterService: SidebarFilterService,
   ) {
   }
 
@@ -49,7 +49,7 @@ export class SidebarFilterComponent implements OnInit {
    * Method to change this.collapsed to false when the slide animation ends and is sliding open
    * @param event The animation event
    */
-  finishSlide(event:any):void {
+  finishSlide(event: any): void {
     if (event.fromState === 'collapsed') {
       this.closed = false;
     }
@@ -59,13 +59,13 @@ export class SidebarFilterComponent implements OnInit {
    * Method to change this.collapsed to true when the slide animation starts and is sliding closed
    * @param event The animation event
    */
-  startSlide(event:any):void {
+  startSlide(event: any): void {
     if (event.toState === 'collapsed') {
       this.closed = true;
     }
   }
 
-  ngOnInit():void {
+  ngOnInit(): void {
     this.closed = !this.expanded;
     this.initializeFilter();
     this.collapsed$ = this.isCollapsed();
@@ -82,7 +82,7 @@ export class SidebarFilterComponent implements OnInit {
    * Checks if the filter is currently collapsed
    * @returns {Observable<boolean>} Emits true when the current state of the filter is collapsed, false when it's expanded
    */
-  private isCollapsed():Observable<boolean> {
+  private isCollapsed(): Observable<boolean> {
     return this.filterService.isCollapsed(this.name);
   }
 
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.reducer.ts b/src/app/shared/sidebar/filter/sidebar-filter.reducer.ts
index d25737eaa9..672a7a2a2d 100644
--- a/src/app/shared/sidebar/filter/sidebar-filter.reducer.ts
+++ b/src/app/shared/sidebar/filter/sidebar-filter.reducer.ts
@@ -8,17 +8,17 @@ import {
  * Interface that represents the state for a single filters
  */
 export interface SidebarFilterState {
-  filterCollapsed:boolean,
+  filterCollapsed: boolean,
 }
 
 /**
  * Interface that represents the state for all available filters
  */
 export interface SidebarFiltersState {
-  [name:string]:SidebarFilterState
+  [name: string]: SidebarFilterState
 }
 
-const initialState:SidebarFiltersState = Object.create(null);
+const initialState: SidebarFiltersState = Object.create(null);
 
 /**
  * Performs a  filter action on the current state
@@ -26,7 +26,7 @@ const initialState:SidebarFiltersState = Object.create(null);
  * @param {SidebarFilterAction} action The action that should be performed
  * @returns {SidebarFiltersState} The state after the action is performed
  */
-export function sidebarFilterReducer(state = initialState, action:SidebarFilterAction):SidebarFiltersState {
+export function sidebarFilterReducer(state = initialState, action: SidebarFilterAction): SidebarFiltersState {
 
   switch (action.type) {
 
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.service.spec.ts b/src/app/shared/sidebar/filter/sidebar-filter.service.spec.ts
new file mode 100644
index 0000000000..83eee3aad5
--- /dev/null
+++ b/src/app/shared/sidebar/filter/sidebar-filter.service.spec.ts
@@ -0,0 +1,109 @@
+import { async, TestBed } from '@angular/core/testing';
+import * as ngrx from '@ngrx/store';
+import { Store, StoreModule } from '@ngrx/store';
+import { provideMockStore } from '@ngrx/store/testing';
+import { cold } from 'jasmine-marbles';
+
+import { sidebarFilterReducer } from './sidebar-filter.reducer';
+import { SidebarFilterService } from './sidebar-filter.service';
+import {
+  FilterCollapseAction,
+  FilterExpandAction,
+  FilterInitializeAction,
+  FilterToggleAction
+} from './sidebar-filter.actions';
+
+describe('SidebarFilterService', () => {
+  let service: SidebarFilterService;
+  let selectSpy;
+  let store: any;
+  let initialState;
+
+  function init() {
+
+    initialState = {
+      sidebarFilter: {
+        filter_1 : {
+          filterCollapsed: true
+        },
+        filter_2 : {
+          filterCollapsed: false
+        },
+        filter_3 : {
+          filterCollapsed: true
+        }
+      }
+    };
+
+  }
+
+  beforeEach(async(() => {
+    init();
+    TestBed.configureTestingModule({
+      imports: [
+        StoreModule.forRoot({ sidebarFilter: sidebarFilterReducer })
+      ],
+      providers: [
+        provideMockStore({ initialState }),
+        { provide: SidebarFilterService, useValue: service }
+      ]
+    }).compileComponents();
+  }));
+
+  beforeEach(() => {
+    store = TestBed.get(Store);
+    service = new SidebarFilterService(store);
+    selectSpy = spyOnProperty(ngrx, 'select').and.callThrough();
+    spyOn(store, 'dispatch');
+  });
+
+  describe('initializeFilter', () => {
+    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
+      service.initializeFilter('fakeFilter', true);
+      expect(store.dispatch).toHaveBeenCalledWith(new FilterInitializeAction('fakeFilter', true));
+    });
+  });
+
+  describe('collapse', () => {
+    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
+      service.collapse('fakeFilter');
+      expect(store.dispatch).toHaveBeenCalledWith(new FilterCollapseAction('fakeFilter'));
+    });
+  });
+
+  describe('expand', () => {
+    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
+      service.expand('fakeFilter');
+      expect(store.dispatch).toHaveBeenCalledWith(new FilterExpandAction('fakeFilter'));
+    });
+  });
+
+  describe('toggle', () => {
+    it('should dispatch an FilterInitializeAction with the correct arguments', () => {
+      service.toggle('fakeFilter');
+      expect(store.dispatch).toHaveBeenCalledWith(new FilterToggleAction('fakeFilter'));
+    });
+  });
+
+  describe('isCollapsed', () => {
+    it('should return true', () => {
+
+      const result = service.isCollapsed('filter_1');
+      const expected = cold('b', {
+        b: true
+      });
+
+      expect(result).toBeObservable(expected);
+    });
+
+    it('should return false', () => {
+
+      const result = service.isCollapsed('filter_2');
+      const expected = cold('b', {
+        b: false
+      });
+
+      expect(result).toBeObservable(expected);
+    });
+  });
+});
diff --git a/src/app/shared/sidebar/filter/sidebar-filter.service.ts b/src/app/shared/sidebar/filter/sidebar-filter.service.ts
index 2ff28fd2f5..b67de24f9e 100644
--- a/src/app/shared/sidebar/filter/sidebar-filter.service.ts
+++ b/src/app/shared/sidebar/filter/sidebar-filter.service.ts
@@ -16,7 +16,7 @@ import { hasValue } from '../../empty.util';
 @Injectable()
 export class SidebarFilterService {
 
-  constructor(private store:Store<SidebarFilterState>) {
+  constructor(private store: Store<SidebarFiltersState>) {
   }
 
   /**
@@ -24,7 +24,7 @@ export class SidebarFilterService {
    * @param {string} filter The filter for which the action is dispatched
    * @param {boolean} expanded If the filter should be open from the start
    */
-  public initializeFilter(filter:string, expanded:boolean):void {
+  public initializeFilter(filter: string, expanded: boolean): void {
     this.store.dispatch(new FilterInitializeAction(filter, expanded));
   }
 
@@ -32,7 +32,7 @@ export class SidebarFilterService {
    * Dispatches a collapse action to the store for a given filter
    * @param {string} filterName The filter for which the action is dispatched
    */
-  public collapse(filterName:string):void {
+  public collapse(filterName: string): void {
     this.store.dispatch(new FilterCollapseAction(filterName));
   }
 
@@ -40,7 +40,7 @@ export class SidebarFilterService {
    * Dispatches an expand action to the store for a given filter
    * @param {string} filterName The filter for which the action is dispatched
    */
-  public expand(filterName:string):void {
+  public expand(filterName: string): void {
     this.store.dispatch(new FilterExpandAction(filterName));
   }
 
@@ -48,7 +48,7 @@ export class SidebarFilterService {
    * Dispatches a toggle action to the store for a given filter
    * @param {string} filterName The filter for which the action is dispatched
    */
-  public toggle(filterName:string):void {
+  public toggle(filterName: string): void {
     this.store.dispatch(new FilterToggleAction(filterName));
   }
 
@@ -57,10 +57,10 @@ export class SidebarFilterService {
    * @param {string} filterName The filtername for which the collapsed state is checked
    * @returns {Observable<boolean>} Emits the current collapsed state of the given filter, if it's unavailable, return false
    */
-  isCollapsed(filterName:string):Observable<boolean> {
+  isCollapsed(filterName: string): Observable<boolean> {
     return this.store.pipe(
       select(filterByNameSelector(filterName)),
-      map((object:SidebarFilterState) => {
+      map((object: SidebarFilterState) => {
         if (object) {
           return object.filterCollapsed;
         } else {
@@ -73,14 +73,14 @@ export class SidebarFilterService {
 
 }
 
-const filterStateSelector = (state:SidebarFiltersState) => state.sidebarFilter;
+const filterStateSelector = (state: SidebarFiltersState) => state.sidebarFilter;
 
-function filterByNameSelector(name:string):MemoizedSelector<SidebarFiltersState, SidebarFilterState> {
+function filterByNameSelector(name: string): MemoizedSelector<SidebarFiltersState, SidebarFilterState> {
   return keySelector<SidebarFilterState>(name);
 }
 
-export function keySelector<T>(key:string):MemoizedSelector<SidebarFiltersState, T> {
-  return createSelector(filterStateSelector, (state:SidebarFilterState) => {
+export function keySelector<T>(key: string): MemoizedSelector<SidebarFiltersState, T> {
+  return createSelector(filterStateSelector, (state: SidebarFilterState) => {
     if (hasValue(state)) {
       return state[key];
     } else {
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 77f59090ab..e9211797a9 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.spec.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.spec.ts
@@ -7,8 +7,8 @@ import { HostWindowService } from '../host-window.service';
 import { NoopAnimationsModule } from '@angular/platform-browser/animations';
 
 describe('PageWithSidebarComponent', () => {
-  let comp:PageWithSidebarComponent;
-  let fixture:ComponentFixture<PageWithSidebarComponent>;
+  let comp: PageWithSidebarComponent;
+  let fixture: ComponentFixture<PageWithSidebarComponent>;
 
   const sidebarService = {
     isCollapsed: observableOf(true),
@@ -42,7 +42,7 @@ describe('PageWithSidebarComponent', () => {
   });
 
   describe('when sidebarCollapsed is true in mobile view', () => {
-    let menu:HTMLElement;
+    let menu: HTMLElement;
 
     beforeEach(() => {
       menu = fixture.debugElement.query(By.css('#mock-id-sidebar-content')).nativeElement;
@@ -58,7 +58,7 @@ describe('PageWithSidebarComponent', () => {
   });
 
   describe('when sidebarCollapsed is false in mobile view', () => {
-    let menu:HTMLElement;
+    let menu: HTMLElement;
 
     beforeEach(() => {
       menu = fixture.debugElement.query(By.css('#mock-id-sidebar-content')).nativeElement;
@@ -70,6 +70,5 @@ describe('PageWithSidebarComponent', () => {
     it('should open the menu', () => {
       expect(menu.classList).toContain('active');
     });
-
   });
 });
diff --git a/src/app/shared/sidebar/page-with-sidebar.component.ts b/src/app/shared/sidebar/page-with-sidebar.component.ts
index 8b7f987a37..44fa238d3b 100644
--- a/src/app/shared/sidebar/page-with-sidebar.component.ts
+++ b/src/app/shared/sidebar/page-with-sidebar.component.ts
@@ -18,13 +18,13 @@ import { map } from 'rxjs/operators';
  * the template outlet (inside the page-width-sidebar tags).
  */
 export class PageWithSidebarComponent implements OnInit {
-  @Input() id:string;
-  @Input() sidebarContent:TemplateRef<any>;
+  @Input() id: string;
+  @Input() sidebarContent: TemplateRef<any>;
 
   /**
    * Emits true if were on a small screen
    */
-  isXsOrSm$:Observable<boolean>;
+  isXsOrSm$: Observable<boolean>;
 
   /**
    * The width of the sidebar (bootstrap columns)
@@ -35,16 +35,16 @@ export class PageWithSidebarComponent implements OnInit {
   /**
    * Observable for whether or not the sidebar is currently collapsed
    */
-  isSidebarCollapsed$:Observable<boolean>;
+  isSidebarCollapsed$: Observable<boolean>;
 
-  sidebarClasses:Observable<string>;
+  sidebarClasses: Observable<string>;
 
-  constructor(protected sidebarService:SidebarService,
-              protected windowService:HostWindowService,
+  constructor(protected sidebarService: SidebarService,
+              protected windowService: HostWindowService,
   ) {
   }
 
-  ngOnInit():void {
+  ngOnInit(): void {
     this.isXsOrSm$ = this.windowService.isXsOrSm();
     this.isSidebarCollapsed$ = this.isSidebarCollapsed();
     this.sidebarClasses = this.isSidebarCollapsed$.pipe(
@@ -56,21 +56,21 @@ export class PageWithSidebarComponent implements OnInit {
    * Check if the sidebar is collapsed
    * @returns {Observable<boolean>} emits true if the sidebar is currently collapsed, false if it is expanded
    */
-  private isSidebarCollapsed():Observable<boolean> {
+  private isSidebarCollapsed(): Observable<boolean> {
     return this.sidebarService.isCollapsed;
   }
 
   /**
    * Set the sidebar to a collapsed state
    */
-  public closeSidebar():void {
+  public closeSidebar(): void {
     this.sidebarService.collapse()
   }
 
   /**
    * Set the sidebar to an expanded state
    */
-  public openSidebar():void {
+  public openSidebar(): void {
     this.sidebarService.expand();
   }
 
diff --git a/src/app/shared/sidebar/search-sidebar.effects.spec.ts b/src/app/shared/sidebar/search-sidebar.effects.spec.ts
deleted file mode 100644
index da675a38ce..0000000000
--- a/src/app/shared/sidebar/search-sidebar.effects.spec.ts
+++ /dev/null
@@ -1,36 +0,0 @@
-import { TestBed } from '@angular/core/testing';
-import { Observable } from 'rxjs';
-import { provideMockActions } from '@ngrx/effects/testing';
-import { cold, hot } from 'jasmine-marbles';
-import * as fromRouter from '@ngrx/router-store';
-import { SidebarCollapseAction } from './sidebar.actions';
-import { SidebarEffects } from './sidebar-effects.service';
-
-describe('SidebarEffects', () => {
-  let sidebarEffects: SidebarEffects;
-  let actions: Observable<any>;
-  const dummyURL = 'http://f4fb15e2-1bd3-4e63-8d0d-486ad8bc714a';
-
-  beforeEach(() => {
-    TestBed.configureTestingModule({
-      providers: [
-        SidebarEffects,
-        provideMockActions(() => actions),
-        // other providers
-      ],
-    });
-
-    sidebarEffects = TestBed.get(SidebarEffects);
-  });
-
-  describe('routeChange$', () => {
-
-    it('should return a COLLAPSE action in response to an UPDATE_LOCATION action to a new route', () => {
-      actions = hot('--a-', { a: { type: fromRouter.ROUTER_NAVIGATION, payload: {routerState: {url: dummyURL}} } });
-
-      const expected = cold('--b-', { b: new SidebarCollapseAction() });
-
-      expect(sidebarEffects.routeChange$).toBeObservable(expected);
-    });
-  });
-});
diff --git a/src/app/shared/sidebar/sidebar-dropdown.component.ts b/src/app/shared/sidebar/sidebar-dropdown.component.ts
index 313538eded..471d357e25 100644
--- a/src/app/shared/sidebar/sidebar-dropdown.component.ts
+++ b/src/app/shared/sidebar/sidebar-dropdown.component.ts
@@ -10,7 +10,7 @@ import { Component, EventEmitter, Input, Output } from '@angular/core';
  * The options should still be provided in the content.
  */
 export class SidebarDropdownComponent {
-  @Input() id:string;
-  @Input() label:string;
-  @Output() change:EventEmitter<any> = new EventEmitter<number>();
+  @Input() id: string;
+  @Input() label: string;
+  @Output() change: EventEmitter<any> = new EventEmitter<number>();
 }
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 10a168ab05..88a1099072 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
@@ -3,8 +3,8 @@ 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 { DebugElement, NO_ERRORS_SCHEMA } from '@angular/core';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
+import { NO_ERRORS_SCHEMA } from '@angular/core';
 import { of as observableOf } from 'rxjs/internal/observable/of';
 import { By } from '@angular/platform-browser';
 import { StartsWithDateComponent } from './starts-with-date.component';
@@ -159,7 +159,7 @@ describe('StartsWithDateComponent', () => {
   describe('when filling in the input form', () => {
     let form;
     const expectedValue = '2015';
-    const extras = {
+    const extras: NavigationExtras = {
       queryParams: Object.assign({ startsWith: expectedValue }),
       queryParamsHandling: 'merge'
     };
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 653c7e6196..590b46f6de 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,5 +1,5 @@
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
-import { ActivatedRoute, Router } from '@angular/router';
+import { ActivatedRoute, NavigationExtras, Router } from '@angular/router';
 import { CommonModule } from '@angular/common';
 import { RouterTestingModule } from '@angular/router/testing';
 import { TranslateModule } from '@ngx-translate/core';
@@ -66,7 +66,7 @@ describe('StartsWithTextComponent', () => {
     let select;
     let input;
     const expectedValue = '0';
-    const extras = {
+    const extras: NavigationExtras = {
       queryParams: Object.assign({ startsWith: expectedValue }),
       queryParamsHandling: 'merge'
     };
@@ -96,7 +96,7 @@ describe('StartsWithTextComponent', () => {
     let select;
     let input;
     const expectedValue = options[1];
-    const extras = {
+    const extras: NavigationExtras = {
       queryParams: Object.assign({ startsWith: expectedValue }),
       queryParamsHandling: 'merge'
     };
@@ -126,7 +126,7 @@ describe('StartsWithTextComponent', () => {
     let optionLink;
     let input;
     const expectedValue = options[1];
-    const extras = {
+    const extras: NavigationExtras = {
       queryParams: Object.assign({ startsWith: expectedValue }),
       queryParamsHandling: 'merge'
     };
@@ -154,7 +154,7 @@ describe('StartsWithTextComponent', () => {
   describe('when filling in the input form', () => {
     let form;
     const expectedValue = 'A';
-    const extras = {
+    const extras: NavigationExtras = {
       queryParams: Object.assign({ startsWith: expectedValue }),
       queryParamsHandling: 'merge'
     };
diff --git a/src/app/shared/uploader/uploader-options.model.ts b/src/app/shared/uploader/uploader-options.model.ts
index 0bd6412b17..f195b0930e 100644
--- a/src/app/shared/uploader/uploader-options.model.ts
+++ b/src/app/shared/uploader/uploader-options.model.ts
@@ -1,3 +1,4 @@
+import { RestRequestMethod } from '../../core/data/rest-request-method';
 
 export class UploaderOptions {
   /**
@@ -9,5 +10,15 @@ export class UploaderOptions {
 
   disableMultipart = false;
 
-  itemAlias: string;
+  itemAlias: string = null;
+
+  /**
+   * Automatically send out an upload request when adding files
+   */
+  autoUpload = true;
+
+  /**
+   * The request method to use for the file upload request
+   */
+  method: RestRequestMethod = RestRequestMethod.POST;
 }
diff --git a/src/app/shared/uploader/uploader.component.html b/src/app/shared/uploader/uploader.component.html
index 9d994313c6..36078fbeb4 100644
--- a/src/app/shared/uploader/uploader.component.html
+++ b/src/app/shared/uploader/uploader.component.html
@@ -19,23 +19,24 @@
          (fileOver)="fileOverBase($event)"
          class="well ds-base-drop-zone mt-1 mb-3 text-muted">
       <p class="text-center m-0 p-0 d-flex justify-content-center align-items-center" *ngIf="uploader?.queue?.length === 0">
-        <span><i class="fas fa-cloud-upload" aria-hidden="true"></i> {{dropMsg | translate}} {{'uploader.or' | translate}}
-          <label class="btn btn-link m-0 p-0">
-            <input class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple  />
-            {{'uploader.browse' | translate}}
-          </label>
-        </span>
+        <span><i class="fas fa-cloud-upload" aria-hidden="true"></i> {{dropMsg | translate}} {{'uploader.or' | translate}}</span>
+        <label class="btn btn-link m-0 p-0 ml-1">
+          <input class="d-none" type="file" ng2FileSelect [uploader]="uploader" multiple  />
+          {{'uploader.browse' | translate}}
+        </label>
       </p>
       <div *ngIf="(isOverBaseDropZone | async) || uploader?.queue?.length !== 0">
         <div class="m-1">
           <div class="upload-item-top">
-            <span class="filename">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | {{ uploader?.queue[0]?.file.name }}</span>
+            <span class="filename">
+              <span *ngIf="!uploader.options.disableMultipart">{{'uploader.queue-length' | translate}}: {{ uploader?.queue?.length }} | </span>{{ uploader?.queue[0]?.file.name }}
+            </span>
             <div class="btn-group btn-group-sm float-right" role="group">
               <button type="button" class="btn btn-danger" (click)="uploader.clearQueue()" [disabled]="!uploader.queue.length">
                 <i class="fas fa-trash" aria-hidden="true"></i>
               </button>
             </div>
-            <span *ngIf="uploader.progress < 100" class="float-right mr-3">{{ uploader.progress }}%</span>
+            <span *ngIf="uploader.progress < 100 && !(uploader.progress === 0 && !uploader.options.autoUpload)" class="float-right mr-3">{{ uploader.progress }}%</span>
             <span *ngIf="uploader.progress === 100" class="float-right mr-3">{{'uploader.processing' | translate}}...</span>
           </div>
           <div class="ds-base-drop-zone-progress clearfix mt-2">
diff --git a/src/app/shared/uploader/uploader.component.spec.ts b/src/app/shared/uploader/uploader.component.spec.ts
index a36bd7241b..dcdac911bf 100644
--- a/src/app/shared/uploader/uploader.component.spec.ts
+++ b/src/app/shared/uploader/uploader.component.spec.ts
@@ -64,12 +64,12 @@ describe('Chips component', () => {
   template: ``
 })
 class TestComponent {
-  public uploadFilesOptions: UploaderOptions = {
+  public uploadFilesOptions: UploaderOptions = Object.assign(new UploaderOptions(), {
     url: 'http://test',
     authToken: null,
     disableMultipart: false,
     itemAlias: null
-  };
+  });
 
   /* tslint:disable:no-empty */
   public onBeforeUpload = () => {
diff --git a/src/app/shared/uploader/uploader.component.ts b/src/app/shared/uploader/uploader.component.ts
index ad52f4a93f..935d196d08 100644
--- a/src/app/shared/uploader/uploader.component.ts
+++ b/src/app/shared/uploader/uploader.component.ts
@@ -95,7 +95,8 @@ export class UploaderComponent {
       disableMultipart: this.uploadFilesOptions.disableMultipart,
       itemAlias: this.uploadFilesOptions.itemAlias,
       removeAfterUpload: true,
-      autoUpload: true
+      autoUpload: this.uploadFilesOptions.autoUpload,
+      method: this.uploadFilesOptions.method
     });
 
     if (isUndefined(this.enableDragOverDocument)) {
@@ -117,7 +118,10 @@ export class UploaderComponent {
     if (isUndefined(this.onBeforeUpload)) {
       this.onBeforeUpload = () => {return};
     }
-    this.uploader.onBeforeUploadItem = () => {
+    this.uploader.onBeforeUploadItem = (item) => {
+      if (item.url !== this.uploader.options.url) {
+        item.url = this.uploader.options.url;
+      }
       this.onBeforeUpload();
       this.isOverDocumentDropZone = observableOf(false);
 
diff --git a/src/app/shared/utils/object-keys-pipe.ts b/src/app/shared/utils/object-keys-pipe.ts
index fd3d018b88..1320dbc4bf 100644
--- a/src/app/shared/utils/object-keys-pipe.ts
+++ b/src/app/shared/utils/object-keys-pipe.ts
@@ -10,7 +10,7 @@ export class ObjectKeysPipe implements PipeTransform {
    * @param value An object
    * @returns {any} Array with all keys the input object
    */
-  transform(value, args:string[]): any {
+  transform(value, args: string[]): any {
     const keys = [];
     Object.keys(value).forEach((k) => keys.push(k));
     return keys;
diff --git a/src/app/shared/utils/object-values-pipe.ts b/src/app/shared/utils/object-values-pipe.ts
index 79efd1cb76..bb511b4e5c 100644
--- a/src/app/shared/utils/object-values-pipe.ts
+++ b/src/app/shared/utils/object-values-pipe.ts
@@ -10,7 +10,7 @@ export class ObjectValuesPipe implements PipeTransform {
    * @param value An object
    * @returns {any} Array with all values of the input object
    */
-  transform(value, args:string[]): any {
+  transform(value, args: string[]): any {
     const values = [];
     Object.values(value).forEach((v) => values.push(v));
     return values;
diff --git a/src/app/shared/utils/relation-query.utils.spec.ts b/src/app/shared/utils/relation-query.utils.spec.ts
new file mode 100644
index 0000000000..f70e904422
--- /dev/null
+++ b/src/app/shared/utils/relation-query.utils.spec.ts
@@ -0,0 +1,18 @@
+import { getFilterByRelation, getQueryByRelations } from './relation-query.utils';
+
+describe('Relation Query Utils', () => {
+  const relationtype = 'isAuthorOfPublication';
+  const itemUUID = 'a7939af0-36ad-430d-af09-7be8b0a4dadd';
+  describe('getQueryByRelations', () => {
+    it('Should return the correct query based on relationtype and uuid', () => {
+      const result = getQueryByRelations(relationtype, itemUUID);
+      expect(result).toEqual('query=relation.isAuthorOfPublication:a7939af0-36ad-430d-af09-7be8b0a4dadd');
+    });
+  });
+  describe('getFilterByRelation', () => {
+    it('Should return the correct query based on relationtype and uuid', () => {
+      const result = getFilterByRelation(relationtype, itemUUID);
+      expect(result).toEqual('f.isAuthorOfPublication=a7939af0-36ad-430d-af09-7be8b0a4dadd');
+    });
+  });
+});
diff --git a/src/app/shared/utils/relation-query.utils.ts b/src/app/shared/utils/relation-query.utils.ts
new file mode 100644
index 0000000000..74f9e64cc9
--- /dev/null
+++ b/src/app/shared/utils/relation-query.utils.ts
@@ -0,0 +1,18 @@
+/**
+ * Get the query for looking up items by relation type
+ * @param {string} relationType   Relation type
+ * @param {string} itemUUID       Item UUID
+ * @returns {string}              Query
+ */
+export function getQueryByRelations(relationType: string, itemUUID: string): string {
+  return `query=relation.${relationType}:${itemUUID}`;
+}
+
+/**
+ * Get the filter for a relation with the item's UUID
+ * @param relationType    The type of relation e.g. 'isAuthorOfPublication'
+ * @param itemUUID        The item's UUID
+ */
+export function getFilterByRelation(relationType: string, itemUUID: string): string {
+  return `f.${relationType}=${itemUUID}`;
+}
diff --git a/src/app/shared/utils/route.utils.spec.ts b/src/app/shared/utils/route.utils.spec.ts
new file mode 100644
index 0000000000..610fd8756d
--- /dev/null
+++ b/src/app/shared/utils/route.utils.spec.ts
@@ -0,0 +1,22 @@
+import { currentPath } from './route.utils';
+
+describe('Route Utils', () => {
+    const urlTree = {
+      root: {
+        children: {
+          primary: {
+            segments: [
+              { path: 'test' },
+              { path: 'path' }
+            ]
+          }
+
+        }
+      }
+    };
+    const router = { parseUrl: () => urlTree } as any;
+    it('Should return the correct current path based on the router', () => {
+      const result = currentPath(router);
+      expect(result).toEqual('/test/path');
+    });
+  });
diff --git a/src/app/shared/utils/route.utils.ts b/src/app/shared/utils/route.utils.ts
new file mode 100644
index 0000000000..6510fb8894
--- /dev/null
+++ b/src/app/shared/utils/route.utils.ts
@@ -0,0 +1,10 @@
+import { Router } from '@angular/router';
+
+/**
+ * Util function to retrieve the current path (without query parameters) the user is on
+ * @param router The router service
+ */
+export function currentPath(router: Router) {
+  const urlTree = router.parseUrl(router.url);
+  return '/' + urlTree.root.children.primary.segments.map((it) => it.path).join('/')
+}
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 cc0175231e..146ba2e3c0 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
@@ -6,7 +6,7 @@ import { RouterTestingModule } from '@angular/router/testing';
 
 import { ChangeDetectionStrategy, Component } from '@angular/core';
 
-import { SearchService } from '../../+search-page/search-service/search.service';
+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';
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 d406573646..4feb8927c2 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
@@ -2,9 +2,11 @@ import { Component, Input, OnDestroy, OnInit } from '@angular/core';
 
 import { Subscription } from 'rxjs';
 
-import { SearchService } from '../../+search-page/search-service/search.service';
+import { SearchService } from '../../core/shared/search/search.service';
 import { ViewMode } from '../../core/shared/view-mode.model';
 import { isEmpty } from '../empty.util';
+import { currentPath } from '../utils/route.utils';
+import { Router } from '@angular/router';
 
 /**
  * Component to switch between list and grid views.
@@ -33,7 +35,7 @@ export class ViewModeSwitchComponent implements OnInit, OnDestroy {
   viewModeEnum = ViewMode;
   private sub: Subscription;
 
-  constructor(private searchService: SearchService) {
+  constructor(private searchService: SearchService, private router: Router) {
   }
 
   /**
@@ -76,7 +78,7 @@ export class ViewModeSwitchComponent implements OnInit, OnDestroy {
    */
   public getSearchLink(): string {
     if (this.inPlaceSearch) {
-      return './';
+      return currentPath(this.router);
     }
     return this.searchService.getSearchLink();
   }
diff --git a/src/app/statistics/angulartics/dspace-provider.spec.ts b/src/app/statistics/angulartics/dspace-provider.spec.ts
new file mode 100644
index 0000000000..8491d8e80c
--- /dev/null
+++ b/src/app/statistics/angulartics/dspace-provider.spec.ts
@@ -0,0 +1,26 @@
+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';
+
+describe('Angulartics2DSpace', () => {
+  let provider: Angulartics2DSpace;
+  let angulartics2: Angulartics2;
+  let statisticsService: jasmine.SpyObj<StatisticsService>;
+
+  beforeEach(() => {
+    angulartics2 = {
+      eventTrack: observableOf({action: 'pageView', properties: {object: 'mock-object'}}),
+      filterDeveloperMode: () => filter(() => true)
+    } as any;
+    statisticsService = jasmine.createSpyObj('statisticsService', {trackViewEvent: null});
+    provider = new Angulartics2DSpace(angulartics2, statisticsService);
+  });
+
+  it('should use the statisticsService', () => {
+    provider.startTracking();
+    expect(statisticsService.trackViewEvent).toHaveBeenCalledWith('mock-object' as any);
+  });
+
+});
diff --git a/src/app/statistics/angulartics/dspace-provider.ts b/src/app/statistics/angulartics/dspace-provider.ts
new file mode 100644
index 0000000000..cd1aab94bd
--- /dev/null
+++ b/src/app/statistics/angulartics/dspace-provider.ts
@@ -0,0 +1,38 @@
+import { Injectable } from '@angular/core';
+import { Angulartics2 } from 'angulartics2';
+import { StatisticsService } from '../statistics.service';
+
+/**
+ * Angulartics2DSpace is a angulartics2 plugin that provides DSpace with the events.
+ */
+@Injectable({providedIn: 'root'})
+export class Angulartics2DSpace {
+
+  constructor(
+    private angulartics2: Angulartics2,
+    private statisticsService: StatisticsService,
+  ) {
+  }
+
+  /**
+   * Activates this plugin
+   */
+  startTracking(): void {
+    this.angulartics2.eventTrack
+      .pipe(this.angulartics2.filterDeveloperMode())
+      .subscribe((event) => this.eventTrack(event));
+  }
+
+  private eventTrack(event) {
+    if (event.action === 'pageView') {
+      this.statisticsService.trackViewEvent(event.properties.object);
+    } else if (event.action === 'search') {
+      this.statisticsService.trackSearchEvent(
+        event.properties.searchOptions,
+        event.properties.page,
+        event.properties.sort,
+        event.properties.filters
+      );
+    }
+  }
+}
diff --git a/src/app/statistics/angulartics/dspace/view-tracker.component.html b/src/app/statistics/angulartics/dspace/view-tracker.component.html
new file mode 100644
index 0000000000..c0c0ffe181
--- /dev/null
+++ b/src/app/statistics/angulartics/dspace/view-tracker.component.html
@@ -0,0 +1 @@
+&nbsp;
diff --git a/src/app/statistics/angulartics/dspace/view-tracker.component.scss b/src/app/statistics/angulartics/dspace/view-tracker.component.scss
new file mode 100644
index 0000000000..c76cafbe44
--- /dev/null
+++ b/src/app/statistics/angulartics/dspace/view-tracker.component.scss
@@ -0,0 +1,3 @@
+:host {
+  display: none
+}
diff --git a/src/app/statistics/angulartics/dspace/view-tracker.component.ts b/src/app/statistics/angulartics/dspace/view-tracker.component.ts
new file mode 100644
index 0000000000..85588aeb97
--- /dev/null
+++ b/src/app/statistics/angulartics/dspace/view-tracker.component.ts
@@ -0,0 +1,27 @@
+import { Component, Input, OnInit } from '@angular/core';
+import { Angulartics2 } from 'angulartics2';
+import { DSpaceObject } from '../../../core/shared/dspace-object.model';
+
+/**
+ * This component triggers a page view statistic
+ */
+@Component({
+  selector: 'ds-view-tracker',
+  styleUrls: ['./view-tracker.component.scss'],
+  templateUrl: './view-tracker.component.html',
+})
+export class ViewTrackerComponent implements OnInit {
+  @Input() object: DSpaceObject;
+
+  constructor(
+    public angulartics2: Angulartics2
+  ) {
+  }
+
+  ngOnInit(): void {
+    this.angulartics2.eventTrack.next({
+      action: 'pageView',
+      properties: {object: this.object},
+    });
+  }
+}
diff --git a/src/app/statistics/statistics.module.ts b/src/app/statistics/statistics.module.ts
new file mode 100644
index 0000000000..58ac1f07ab
--- /dev/null
+++ b/src/app/statistics/statistics.module.ts
@@ -0,0 +1,36 @@
+import { ModuleWithProviders, NgModule } from '@angular/core';
+import { CommonModule } from '@angular/common';
+import { CoreModule } from '../core/core.module';
+import { SharedModule } from '../shared/shared.module';
+import { ViewTrackerComponent } from './angulartics/dspace/view-tracker.component';
+import { StatisticsService } from './statistics.service';
+
+@NgModule({
+  imports: [
+    CommonModule,
+    CoreModule.forRoot(),
+    SharedModule,
+  ],
+  declarations: [
+    ViewTrackerComponent,
+  ],
+  exports: [
+    ViewTrackerComponent,
+  ],
+  providers: [
+    StatisticsService
+  ]
+})
+/**
+ * This module handles the statistics
+ */
+export class StatisticsModule {
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: StatisticsModule,
+      providers: [
+        StatisticsService
+      ]
+    };
+  }
+}
diff --git a/src/app/statistics/statistics.service.spec.ts b/src/app/statistics/statistics.service.spec.ts
new file mode 100644
index 0000000000..1d659aac2b
--- /dev/null
+++ b/src/app/statistics/statistics.service.spec.ts
@@ -0,0 +1,144 @@
+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/mock-request.service';
+import { TrackRequest } from './track-request.model';
+import { isEqual } from 'lodash';
+import { DSpaceObjectType } from '../core/shared/dspace-object-type.model';
+import { SearchOptions } from '../shared/search/search-options.model';
+
+describe('StatisticsService', () => {
+  let service: StatisticsService;
+  let requestService: jasmine.SpyObj<RequestService>;
+  const restURL = 'https://rest.api';
+  const halService: any = new HALEndpointServiceStub(restURL);
+
+  function initTestService() {
+    return new StatisticsService(
+      requestService,
+      halService,
+    );
+  }
+
+  describe('trackViewEvent', () => {
+    requestService = getMockRequestService();
+    service = initTestService();
+
+    it('should send a request to track an item view ', () => {
+      const mockItem: any = {uuid: 'mock-item-uuid', type: 'item'};
+      service.trackViewEvent(mockItem);
+      const request: TrackRequest = requestService.configure.calls.mostRecent().args[0];
+      expect(request.body).toBeDefined('request.body');
+      const body = JSON.parse(request.body);
+      expect(body.targetId).toBe('mock-item-uuid');
+      expect(body.targetType).toBe('item');
+    });
+  });
+
+  describe('trackSearchEvent', () => {
+    requestService = getMockRequestService();
+    service = initTestService();
+
+    const mockSearch: any = new SearchOptions({
+      query: 'mock-query',
+    });
+
+    const page = {
+      size: 10,
+      totalElements: 248,
+      totalPages: 25,
+      number: 4
+    };
+    const sort = {by: 'search-field', order: 'ASC'};
+    service.trackSearchEvent(mockSearch, page, sort);
+    const request: TrackRequest = requestService.configure.calls.mostRecent().args[0];
+    const body = JSON.parse(request.body);
+
+    it('should specify the right query', () => {
+      expect(body.query).toBe('mock-query');
+    });
+
+    it('should specify the pagination info', () => {
+      expect(body.page).toEqual({
+        size: 10,
+        totalElements: 248,
+        totalPages: 25,
+        number: 4
+      });
+    });
+
+    it('should specify the sort options', () => {
+      expect(body.sort).toEqual({
+        by: 'search-field',
+        order: 'asc'
+      });
+    });
+  });
+
+  describe('trackSearchEvent with optional parameters', () => {
+    requestService = getMockRequestService();
+    service = initTestService();
+
+    const mockSearch: any = new SearchOptions({
+      query: 'mock-query',
+      configuration: 'mock-configuration',
+      dsoType: DSpaceObjectType.ITEM,
+      scope: 'mock-scope'
+    });
+
+    const page = {
+      size: 10,
+      totalElements: 248,
+      totalPages: 25,
+      number: 4
+    };
+    const sort = {by: 'search-field', order: 'ASC'};
+    const filters = [
+      {
+        filter: 'title',
+        operator: 'notcontains',
+        value: 'dolor sit',
+        label: 'dolor sit'
+      },
+      {
+        filter: 'author',
+        operator: 'authority',
+        value: '9zvxzdm4qru17or5a83wfgac',
+        label: 'Amet, Consectetur'
+      }
+    ];
+    service.trackSearchEvent(mockSearch, page, sort, filters);
+    const request: TrackRequest = requestService.configure.calls.mostRecent().args[0];
+    const body = JSON.parse(request.body);
+
+    it('should specify the dsoType', () => {
+      expect(body.dsoType).toBe('item');
+    });
+
+    it('should specify the scope', () => {
+      expect(body.scope).toBe('mock-scope');
+    });
+
+    it('should specify the configuration', () => {
+      expect(body.configuration).toBe('mock-configuration');
+    });
+
+    it('should specify the filters', () => {
+      expect(isEqual(body.appliedFilters, [
+        {
+          filter: 'title',
+          operator: 'notcontains',
+          value: 'dolor sit',
+          label: 'dolor sit'
+        },
+        {
+          filter: 'author',
+          operator: 'authority',
+          value: '9zvxzdm4qru17or5a83wfgac',
+          label: 'Amet, Consectetur'
+        }
+      ])).toBe(true);
+    });
+  });
+
+});
diff --git a/src/app/statistics/statistics.service.ts b/src/app/statistics/statistics.service.ts
new file mode 100644
index 0000000000..004e013164
--- /dev/null
+++ b/src/app/statistics/statistics.service.ts
@@ -0,0 +1,93 @@
+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 { RestRequest } from '../core/data/request.models';
+import { SearchOptions } from '../shared/search/search-options.model';
+
+/**
+ * The statistics service
+ */
+@Injectable()
+export class StatisticsService {
+
+  constructor(
+    protected requestService: RequestService,
+    protected halService: HALEndpointService,
+  ) {
+  }
+
+  private sendEvent(linkPath: string, body: any) {
+    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
+    ).subscribe((request: RestRequest) => this.requestService.configure(request));
+  }
+
+  /**
+   * To track a page view
+   * @param dso: The dso which was viewed
+   */
+  trackViewEvent(dso: DSpaceObject) {
+    this.sendEvent('/statistics/viewevents', {
+      targetId: dso.uuid,
+      targetType: (dso as any).type
+    });
+  }
+
+  /**
+   * To track a search
+   * @param searchOptions: The query, scope, dsoType and configuration of the search. Filters from this object are ignored in favor of the filters parameter of this method.
+   * @param page: An object that describes the pagination status
+   * @param sort: An object that describes the sort status
+   * @param filters: An array of search filters used to filter the result set
+   */
+  trackSearchEvent(
+    searchOptions: SearchOptions,
+    page: { size: number, totalElements: number, totalPages: number, number: number },
+    sort: { by: string, order: string },
+    filters?: Array<{ filter: string, operator: string, value: string, label: string }>
+  ) {
+    const body = {
+      query: searchOptions.query,
+      page: {
+        size: page.size,
+        totalElements: page.totalElements,
+        totalPages: page.totalPages,
+        number: page.number
+      },
+      sort: {
+        by: sort.by,
+        order: sort.order.toLowerCase()
+      },
+    };
+    if (hasValue(searchOptions.configuration)) {
+      Object.assign(body, { configuration: searchOptions.configuration })
+    }
+    if (hasValue(searchOptions.dsoType)) {
+      Object.assign(body, { dsoType: searchOptions.dsoType.toLowerCase() })
+    }
+    if (hasValue(searchOptions.scope)) {
+      Object.assign(body, { scope: searchOptions.scope })
+    }
+    if (isNotEmpty(filters)) {
+      const bodyFilters = [];
+      for (let i = 0, arrayLength = filters.length; i < arrayLength; i++) {
+        const filter = filters[i];
+        bodyFilters.push({
+          filter: filter.filter,
+          operator: filter.operator,
+          value: filter.value,
+          label: filter.label
+        })
+      }
+      Object.assign(body, { appliedFilters: bodyFilters })
+    }
+    this.sendEvent('/statistics/searchevents', body);
+  }
+
+}
diff --git a/src/app/statistics/track-request.model.ts b/src/app/statistics/track-request.model.ts
new file mode 100644
index 0000000000..770d3146c6
--- /dev/null
+++ b/src/app/statistics/track-request.model.ts
@@ -0,0 +1,11 @@
+import { ResponseParsingService } from '../core/data/parsing.service';
+import { PostRequest } from '../core/data/request.models';
+import { StatusCodeOnlyResponseParsingService } from '../core/data/status-code-only-response-parsing.service';
+import { GenericConstructor } from '../core/shared/generic-constructor';
+
+export class TrackRequest extends PostRequest {
+
+  getResponseParser(): GenericConstructor<ResponseParsingService> {
+    return StatusCodeOnlyResponseParsingService;
+  }
+}
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 b95a140b46..8539560d26 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
@@ -19,8 +19,8 @@ import { SubmissionJsonPatchOperationsService } from '../../../core/submission/s
 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 { Community } from '../../../core/shared/community.model';
 import { RemoteData } from '../../../core/data/remote-data';
+import { Community } from '../../../core/shared/community.model';
 import { PaginatedList } from '../../../core/data/paginated-list';
 import { PageInfo } from '../../../core/shared/page-info.model';
 import { Collection } from '../../../core/shared/collection.model';
@@ -342,7 +342,7 @@ describe('SubmissionFormCollectionComponent Component', () => {
       fixture.detectChanges();
 
       expect(comp.searchField.reset).toHaveBeenCalled();
-      expect(comp.collectionChange.emit).toHaveBeenCalledWith(submissionRestResponse[0]);
+      expect(comp.collectionChange.emit).toHaveBeenCalledWith(submissionRestResponse[0] as any);
       expect(submissionServiceStub.changeSubmissionCollection).toHaveBeenCalled();
       expect(comp.selectedCollectionId).toBe(mockCollectionList[1].collection.id);
       expect(comp.selectedCollectionName$).toBeObservable(cold('(a|)', {
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 79d2f2a7bc..f84764d6a4 100644
--- a/src/app/submission/form/collection/submission-form-collection.component.ts
+++ b/src/app/submission/form/collection/submission-form-collection.component.ts
@@ -36,7 +36,7 @@ import { SubmissionService } from '../../submission.service';
 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 { FindAllOptions } from '../../../core/data/request.models';
+import { FindListOptions } from '../../../core/data/request.models';
 
 /**
  * An interface to represent a collection entry
@@ -205,7 +205,7 @@ export class SubmissionFormCollectionComponent implements OnChanges, OnInit {
         map((collectionRD: RemoteData<Collection>) => collectionRD.payload.name)
       );
 
-      const findOptions: FindAllOptions = {
+      const findOptions: FindListOptions = {
         elementsPerPage: 1000
       };
 
diff --git a/src/app/submission/form/submission-form.component.ts b/src/app/submission/form/submission-form.component.ts
index b592972839..3ea07f9ae7 100644
--- a/src/app/submission/form/submission-form.component.ts
+++ b/src/app/submission/form/submission-form.component.ts
@@ -1,7 +1,7 @@
 import { ChangeDetectorRef, Component, Input, OnChanges, OnDestroy, SimpleChanges } from '@angular/core';
 
 import { of as observableOf, Observable, Subscription } from 'rxjs';
-import { distinctUntilChanged, filter, flatMap, map } from 'rxjs/operators';
+import { distinctUntilChanged, filter, flatMap, map, switchMap } from 'rxjs/operators';
 
 import { hasValue, isNotEmpty } from '../../shared/empty.util';
 import { SubmissionObjectEntry } from '../objects/submission-objects.reducer';
@@ -77,12 +77,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
    * The uploader configuration options
    * @type {UploaderOptions}
    */
-  public uploadFilesOptions: UploaderOptions = {
-    url: '',
-    authToken: null,
-    disableMultipart: false,
-    itemAlias: null
-  };
+  public uploadFilesOptions: UploaderOptions = new UploaderOptions();
 
   /**
    * A boolean representing if component is active
@@ -125,7 +120,7 @@ export class SubmissionFormComponent implements OnChanges, OnDestroy {
         map((submission: SubmissionObjectEntry) => submission.isLoading),
         map((isLoading: boolean) => isLoading),
         distinctUntilChanged(),
-        flatMap((isLoading: boolean) => {
+        switchMap((isLoading: boolean) => {
           if (!isLoading) {
             return this.getSectionsList();
           } else {
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 60a572df54..34d291f0e4 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
@@ -28,6 +28,7 @@ import { SubmissionJsonPatchOperationsServiceStub } from '../../../shared/testin
 import { SubmissionJsonPatchOperationsService } from '../../../core/submission/submission-json-patch-operations.service';
 import { SharedModule } from '../../../shared/shared.module';
 import { createTestComponent } from '../../../shared/testing/utils';
+import { UploaderOptions } from '../../../shared/uploader/uploader-options.model';
 
 describe('SubmissionUploadFilesComponent Component', () => {
 
@@ -112,12 +113,12 @@ describe('SubmissionUploadFilesComponent Component', () => {
       comp.submissionId = submissionId;
       comp.collectionId = collectionId;
       comp.sectionId = 'upload';
-      comp.uploadFilesOptions = {
+      comp.uploadFilesOptions = Object.assign(new UploaderOptions(),{
         url: '',
         authToken: null,
         disableMultipart: false,
         itemAlias: null
-      };
+      });
 
     });
 
@@ -208,11 +209,11 @@ class TestComponent {
   submissionId = mockSubmissionId;
   collectionId = mockSubmissionCollectionId;
   sectionId = 'upload';
-  uploadFilesOptions = {
+  uploadFilesOptions = Object.assign(new UploaderOptions(), {
     url: '',
     authToken: null,
     disableMultipart: false,
     itemAlias: null
-  };
+  });
 
 }
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 eb56a92113..be13c14941 100644
--- a/src/app/submission/sections/form/section-form.component.spec.ts
+++ b/src/app/submission/sections/form/section-form.component.spec.ts
@@ -43,6 +43,9 @@ import { SubmissionSectionError } from '../../objects/submission-objects.reducer
 import { DynamicFormControlEvent, DynamicFormControlEventType } from '@ng-dynamic-forms/core';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { FormRowModel } from '../../../core/config/models/config-submission-form.model';
+import { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
+import { RemoteData } from '../../../core/data/remote-data';
+import { WorkspaceItem } from '../../../core/submission/models/workspaceitem.model';
 
 function getMockSubmissionFormsConfigService(): SubmissionFormsConfigService {
   return jasmine.createSpyObj('FormOperationsService', {
@@ -115,11 +118,11 @@ const testFormConfiguration = {
 const testFormModel = [
   new DynamicRowGroupModel({
     id: 'df-row-group-config-1',
-    group: [new DsDynamicInputModel({ id: 'dc.title' })],
+    group: [new DsDynamicInputModel({ id: 'dc.title', metadataFields: [], repeatable: false, submissionId: '1234' })],
   }),
   new DynamicRowGroupModel({
     id: 'df-row-group-config-2',
-    group: [new DsDynamicInputModel({ id: 'dc.contributor' })],
+    group: [new DsDynamicInputModel({ id: 'dc.contributor', metadataFields: [], repeatable: false, submissionId: '1234' })],
   })
 ];
 
@@ -179,6 +182,7 @@ describe('SubmissionSectionformComponent test suite', () => {
         { provide: 'collectionIdProvider', useValue: collectionId },
         { provide: 'sectionDataProvider', useValue: sectionObject },
         { provide: 'submissionIdProvider', useValue: submissionId },
+        { provide: WorkspaceitemDataService, useValue: {findById: () => observableOf(new RemoteData(false, false, true, null, new WorkspaceItem()))}},
         ChangeDetectorRef,
         SubmissionSectionformComponent
       ],
diff --git a/src/app/submission/sections/form/section-form.component.ts b/src/app/submission/sections/form/section-form.component.ts
index 2269ccd5f1..49dbaea807 100644
--- a/src/app/submission/sections/form/section-form.component.ts
+++ b/src/app/submission/sections/form/section-form.component.ts
@@ -15,7 +15,10 @@ import { hasValue, isNotEmpty, isUndefined } from '../../../shared/empty.util';
 import { ConfigData } from '../../../core/config/config-data';
 import { JsonPatchOperationPathCombiner } from '../../../core/json-patch/builder/json-patch-operation-path-combiner';
 import { SubmissionFormsModel } from '../../../core/config/models/config-submission-forms.model';
-import { SubmissionSectionError, SubmissionSectionObject } from '../../objects/submission-objects.reducer';
+import {
+  SubmissionSectionError,
+  SubmissionSectionObject
+} from '../../objects/submission-objects.reducer';
 import { FormFieldPreviousValueObject } from '../../../shared/form/builder/models/form-field-previous-value-object';
 import { GLOBAL_CONFIG } from '../../../../config';
 import { GlobalConfig } from '../../../../config/global-config.interface';
@@ -28,6 +31,11 @@ import { NotificationsService } from '../../../shared/notifications/notification
 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 { WorkspaceitemDataService } from '../../../core/submission/workspaceitem-data.service';
+import { combineLatest as combineLatestObservable } from 'rxjs';
+import { getSucceededRemoteData } from '../../../core/shared/operators';
+import { RemoteData } from '../../../core/data/remote-data';
 
 /**
  * This component represents a section that contains a Form.
@@ -100,6 +108,7 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
    */
   protected subs: Subscription[] = [];
 
+  protected workspaceItem: WorkspaceItem;
   /**
    * The FormComponent reference
    */
@@ -131,6 +140,7 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
               protected sectionService: SectionsService,
               protected submissionService: SubmissionService,
               protected translate: TranslateService,
+              protected workspaceItemDataService: WorkspaceitemDataService,
               @Inject(GLOBAL_CONFIG) protected EnvConfig: GlobalConfig,
               @Inject('collectionIdProvider') public injectedCollectionId: string,
               @Inject('sectionDataProvider') public injectedSectionData: SectionDataObject,
@@ -144,15 +154,19 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
   onSectionInit() {
     this.pathCombiner = new JsonPatchOperationPathCombiner('sections', this.sectionData.id);
     this.formId = this.formService.getUniqueId(this.sectionData.id);
-
     this.formConfigService.getConfigByHref(this.sectionData.config).pipe(
       map((configData: ConfigData) => configData.payload),
       tap((config: SubmissionFormsModel) => this.formConfig = config),
-      flatMap(() => this.sectionService.getSectionData(this.submissionId, this.sectionData.id)),
+      flatMap(() =>
+        combineLatestObservable(
+          this.sectionService.getSectionData(this.submissionId, this.sectionData.id),
+          this.workspaceItemDataService.findById(this.submissionId).pipe(getSucceededRemoteData(), map((wsiRD: RemoteData<WorkspaceItem>) => wsiRD.payload))
+        )),
       take(1))
-      .subscribe((sectionData: WorkspaceitemSectionFormObject) => {
+      .subscribe(([sectionData, workspaceItem]: [WorkspaceitemSectionFormObject, WorkspaceItem]) => {
         if (isUndefined(this.formModel)) {
           this.sectionData.errors = [];
+          this.workspaceItem = workspaceItem;
           // Is the first loading so init form
           this.initForm(sectionData);
           this.sectionData.data = sectionData;
@@ -215,16 +229,19 @@ export class SubmissionSectionformComponent extends SectionModelComponent {
   initForm(sectionData: WorkspaceitemSectionFormObject): void {
     try {
       this.formModel = this.formBuilderService.modelFromConfiguration(
+        this.submissionId,
         this.formConfig,
         this.collectionId,
         sectionData,
-        this.submissionService.getSubmissionScope());
+        this.submissionService.getSubmissionScope()
+      );
     } catch (e) {
       const msg: string = this.translate.instant('error.submission.sections.init-form-error') + e.toString();
       const sectionError: SubmissionSectionError = {
         message: msg,
         path: '/sections/' + this.sectionData.id
       };
+      console.error(e.stack);
       this.sectionService.setSectionError(this.submissionId, this.sectionData.id, sectionError);
     }
   }
diff --git a/src/app/submission/sections/sections-type.ts b/src/app/submission/sections/sections-type.ts
index 02e0ba478b..34ecafe42b 100644
--- a/src/app/submission/sections/sections-type.ts
+++ b/src/app/submission/sections/sections-type.ts
@@ -1,4 +1,5 @@
 export enum SectionsType {
+  Relationships = 'relationships',
   SubmissionForm = 'submission-form',
   Upload = 'upload',
   License = 'license',
diff --git a/src/app/submission/sections/sections.service.ts b/src/app/submission/sections/sections.service.ts
index aed83143a5..f6ad5ef0cf 100644
--- a/src/app/submission/sections/sections.service.ts
+++ b/src/app/submission/sections/sections.service.ts
@@ -84,7 +84,7 @@ export class SectionsService {
     } else if (!isEqual(currentErrors, prevErrors)) { // compare previous error list with the current one
       const dispatchedErrors = [];
 
-      // Itereate over the current error list
+      // Iterate over the current error list
       currentErrors.forEach((error: SubmissionSectionError) => {
         const errorPaths: SectionErrorPath[] = parseSectionErrorPaths(error.path);
 
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 b2575d1d58..8cf0d22d20 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
@@ -166,6 +166,7 @@ export class SubmissionSectionUploadFileEditComponent implements OnChanges {
     const formModel: DynamicFormControlModel[] = [];
     const metadataGroupModelConfig = Object.assign({}, BITSTREAM_METADATA_FORM_GROUP_CONFIG);
     metadataGroupModelConfig.group = this.formBuilderService.modelFromConfiguration(
+      this.submissionId,
       configForm,
       this.collectionId,
       this.fileData.metadata,
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 f87aa7d703..54b51e7afc 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
@@ -37,6 +37,7 @@ import { getMockSectionUploadService } from '../../../../shared/mocks/mock-secti
 import { FormFieldMetadataValueObject } from '../../../../shared/form/builder/models/form-field-metadata-value.model';
 import { Group } from '../../../../core/eperson/models/group.model';
 import { SubmissionSectionUploadFileEditComponent } from './edit/section-upload-file-edit.component';
+import { FormBuilderService } from '../../../../shared/form/builder/form-builder.service';
 
 function getMockFileService(): FileService {
   return jasmine.createSpyObj('FileService', {
@@ -104,7 +105,8 @@ describe('SubmissionSectionUploadFileComponent test suite', () => {
         ChangeDetectorRef,
         NgbModal,
         SubmissionSectionUploadFileComponent,
-        SubmissionSectionUploadFileEditComponent
+        SubmissionSectionUploadFileEditComponent,
+        FormBuilderService
       ],
       schemas: [NO_ERRORS_SCHEMA]
     }).compileComponents().then();
diff --git a/src/app/submission/submission.service.spec.ts b/src/app/submission/submission.service.spec.ts
index d67fb3679a..1b346a56eb 100644
--- a/src/app/submission/submission.service.spec.ts
+++ b/src/app/submission/submission.service.spec.ts
@@ -37,18 +37,16 @@ import {
   SaveSubmissionSectionFormAction,
   SetActiveSectionAction
 } from './objects/submission-objects.actions';
-import { RemoteData } from '../core/data/remote-data';
 import { RemoteDataError } from '../core/data/remote-data-error';
 import { throwError as observableThrowError } from 'rxjs/internal/observable/throwError';
 import {
   createFailedRemoteDataObject,
   createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
 } from '../shared/testing/utils';
 import { getMockSearchService } from '../shared/mocks/mock-search-service';
 import { getMockRequestService } from '../shared/mocks/mock-request.service';
-import { SearchService } from '../+search-page/search-service/search.service';
 import { RequestService } from '../core/data/request.service';
+import { SearchService } from '../core/shared/search/search.service';
 
 describe('SubmissionService test suite', () => {
   const config = MOCK_SUBMISSION_CONFIG;
@@ -403,6 +401,14 @@ describe('SubmissionService test suite', () => {
       service.createSubmission();
 
       expect((service as any).restService.postToEndpoint).toHaveBeenCalled();
+      expect((service as any).restService.postToEndpoint).toHaveBeenCalledWith('workspaceitems', {}, null, null, undefined);
+    });
+
+    it('should create a new submission with collection', () => {
+      service.createSubmission(collectionId);
+
+      expect((service as any).restService.postToEndpoint).toHaveBeenCalled();
+      expect((service as any).restService.postToEndpoint).toHaveBeenCalledWith('workspaceitems', {}, null, null, collectionId);
     });
   });
 
diff --git a/src/app/submission/submission.service.ts b/src/app/submission/submission.service.ts
index c9be658b31..ac0cd7bec8 100644
--- a/src/app/submission/submission.service.ts
+++ b/src/app/submission/submission.service.ts
@@ -3,14 +3,7 @@ import { HttpHeaders } from '@angular/common/http';
 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 { catchError, concatMap, distinctUntilChanged, filter, find, map, startWith, take, tap } from 'rxjs/operators';
 import { Store } from '@ngrx/store';
 import { TranslateService } from '@ngx-translate/core';
 
@@ -50,13 +43,9 @@ import { WorkspaceitemSectionsObject } from '../core/submission/models/workspace
 import { RemoteData } from '../core/data/remote-data';
 import { ErrorResponse } from '../core/cache/response.models';
 import { RemoteDataError } from '../core/data/remote-data-error';
-import {
-  createFailedRemoteDataObject$,
-  createSuccessfulRemoteDataObject,
-  createSuccessfulRemoteDataObject$
-} from '../shared/testing/utils';
-import { SearchService } from '../+search-page/search-service/search.service';
+import { createFailedRemoteDataObject$, createSuccessfulRemoteDataObject } from '../shared/testing/utils';
 import { RequestService } from '../core/data/request.service';
+import { SearchService } from '../core/shared/search/search.service';
 
 /**
  * A service that provides methods used in submission process.
@@ -74,6 +63,8 @@ export class SubmissionService {
    */
   protected timer$: Observable<any>;
 
+  private workspaceLinkPath = 'workspaceitems';
+  private workflowLinkPath = 'workflowitems';
   /**
    * Initialize service variables
    * @param {GlobalConfig} EnvConfig
@@ -112,13 +103,15 @@ export class SubmissionService {
   /**
    * Perform a REST call to create a new workspaceitem and return response
    *
+   * @param collectionId
+   *    The owning collection id
    * @return Observable<SubmissionObject>
    *    observable of SubmissionObject
    */
-  createSubmission(): Observable<SubmissionObject> {
-    return this.restService.postToEndpoint('workspaceitems', {}).pipe(
-      map((workspaceitem: SubmissionObject) => workspaceitem[0]),
-      catchError(() => observableOf({})))
+  createSubmission(collectionId?: string): Observable<SubmissionObject> {
+    return this.restService.postToEndpoint(this.workspaceLinkPath, {}, null, null, collectionId).pipe(
+      map((workspaceitem: SubmissionObject[]) => workspaceitem[0] as SubmissionObject),
+      catchError(() => observableOf({} as SubmissionObject)))
   }
 
   /**
@@ -134,7 +127,7 @@ export class SubmissionService {
     let headers = new HttpHeaders();
     headers = headers.append('Content-Type', 'text/uri-list');
     options.headers = headers;
-    return this.restService.postToEndpoint('workflowitems', selfUrl, null, options) as Observable<SubmissionObject[]>;
+    return this.restService.postToEndpoint(this.workflowLinkPath, selfUrl, null, options) as Observable<SubmissionObject[]>;
   }
 
   /**
@@ -328,9 +321,9 @@ export class SubmissionService {
   getSubmissionObjectLinkName(): string {
     const url = this.router.routerState.snapshot.url;
     if (url.startsWith('/workspaceitems') || url.startsWith('/submit')) {
-      return 'workspaceitems';
+      return this.workspaceLinkPath;
     } else if (url.startsWith('/workflowitems')) {
-      return 'workflowitems';
+      return this.workflowLinkPath;
     } else {
       return 'edititems';
     }
@@ -345,10 +338,10 @@ export class SubmissionService {
   getSubmissionScope(): SubmissionScopeType {
     let scope: SubmissionScopeType;
     switch (this.getSubmissionObjectLinkName()) {
-      case 'workspaceitems':
+      case this.workspaceLinkPath:
         scope = SubmissionScopeType.WorkspaceItem;
         break;
-      case 'workflowitems':
+      case this.workflowLinkPath:
         scope = SubmissionScopeType.WorkflowItem;
         break;
     }
diff --git a/src/app/submission/submit/submission-submit.component.spec.ts b/src/app/submission/submit/submission-submit.component.spec.ts
index 771171a2d1..ca3316669f 100644
--- a/src/app/submission/submit/submission-submit.component.spec.ts
+++ b/src/app/submission/submit/submission-submit.component.spec.ts
@@ -1,6 +1,6 @@
 import { async, ComponentFixture, fakeAsync, TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 import { NO_ERRORS_SCHEMA, ViewContainerRef } from '@angular/core';
 
 import { of as observableOf } from 'rxjs';
@@ -14,6 +14,7 @@ import { getMockTranslateService } from '../../shared/mocks/mock-translate.servi
 import { RouterStub } from '../../shared/testing/router-stub';
 import { mockSubmissionObject } from '../../shared/mocks/mock-submission';
 import { SubmissionSubmitComponent } from './submission-submit.component';
+import { ActivatedRouteStub } from '../../shared/testing/active-router-stub';
 
 describe('SubmissionSubmitComponent Component', () => {
 
@@ -39,6 +40,7 @@ describe('SubmissionSubmitComponent Component', () => {
         { provide: SubmissionService, useClass: SubmissionServiceStub },
         { provide: TranslateService, useValue: getMockTranslateService() },
         { provide: Router, useValue: new RouterStub() },
+        { provide: ActivatedRoute, useValue: new ActivatedRouteStub() },
         ViewContainerRef
       ],
       schemas: [NO_ERRORS_SCHEMA]
diff --git a/src/app/submission/submit/submission-submit.component.ts b/src/app/submission/submit/submission-submit.component.ts
index dbfd2f5a40..0aa0380a25 100644
--- a/src/app/submission/submit/submission-submit.component.ts
+++ b/src/app/submission/submit/submission-submit.component.ts
@@ -1,5 +1,5 @@
 import { ChangeDetectorRef, Component, OnDestroy, OnInit, ViewContainerRef } from '@angular/core';
-import { Router } from '@angular/router';
+import { ActivatedRoute, Router } from '@angular/router';
 
 import { Subscription } from 'rxjs';
 
@@ -27,6 +27,12 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
    */
   public collectionId: string;
 
+  /**
+   * The collection id input to create a new submission
+   * @type {string}
+   */
+  public collectionParam: string;
+
   /**
    * The submission self url
    * @type {string}
@@ -56,17 +62,22 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
    *
    * @param {ChangeDetectorRef} changeDetectorRef
    * @param {NotificationsService} notificationsService
-   * @param {SubmissionService} submissioService
+   * @param {SubmissionService} submissionService
    * @param {Router} router
    * @param {TranslateService} translate
    * @param {ViewContainerRef} viewContainerRef
+   * @param {ActivatedRoute} route
    */
   constructor(private changeDetectorRef: ChangeDetectorRef,
               private notificationsService: NotificationsService,
               private router: Router,
-              private submissioService: SubmissionService,
+              private submissionService: SubmissionService,
               private translate: TranslateService,
-              private viewContainerRef: ViewContainerRef) {
+              private viewContainerRef: ViewContainerRef,
+              private route: ActivatedRoute) {
+    this.route
+      .queryParams
+      .subscribe((params) => { this.collectionParam = (params.collection); });
   }
 
   /**
@@ -75,7 +86,7 @@ export class SubmissionSubmitComponent implements OnDestroy, OnInit {
   ngOnInit() {
     // NOTE execute the code on the browser side only, otherwise it is executed twice
     this.subs.push(
-      this.submissioService.createSubmission()
+      this.submissionService.createSubmission(this.collectionParam)
         .subscribe((submissionObject: SubmissionObject) => {
           // NOTE new submission is created on the browser side only
           if (isNotNull(submissionObject)) {
diff --git a/src/backend/api.ts b/src/backend/api.ts
index e1943b5d30..a4763f0be7 100644
--- a/src/backend/api.ts
+++ b/src/backend/api.ts
@@ -117,7 +117,7 @@ export function createMockApi() {
     const id = req.params.item_id;
     try {
       req.item_id = id;
-      req.item = ITEMS.items.find((item) => {
+      req.itemRD$ = ITEMS.items.find((item) => {
         return item.id === id;
       });
       next();
@@ -127,7 +127,7 @@ export function createMockApi() {
   });
 
   router.route('/items/:item_id').get((req, res) => {
-    res.json(toHALResponse(req, req.item));
+    res.json(toHALResponse(req, req.itemRD$));
   });
 
   router.route('/bundles').get((req, res) => {
diff --git a/src/modules/app/browser-app.module.ts b/src/modules/app/browser-app.module.ts
index ede2b53e74..0dbe4f58fe 100644
--- a/src/modules/app/browser-app.module.ts
+++ b/src/modules/app/browser-app.module.ts
@@ -19,8 +19,8 @@ import { ClientCookieService } from '../../app/core/services/client-cookie.servi
 import { CookieService } from '../../app/core/services/cookie.service';
 import { AuthService } from '../../app/core/auth/auth.service';
 import { Angulartics2Module } from 'angulartics2';
-import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
 import { SubmissionService } from '../../app/submission/submission.service';
+import { StatisticsModule } from '../../app/statistics/statistics.module';
 
 export const REQ_KEY = makeStateKey<string>('req');
 
@@ -47,7 +47,8 @@ export function getRequest(transferState: TransferState): any {
       preloadingStrategy:
       IdlePreload
     }),
-    Angulartics2Module.forRoot([Angulartics2GoogleAnalytics]),
+    StatisticsModule.forRoot(),
+    Angulartics2Module.forRoot(),
     BrowserAnimationsModule,
     DSpaceBrowserTransferStateModule,
     TranslateModule.forRoot({
diff --git a/src/modules/app/server-app.module.ts b/src/modules/app/server-app.module.ts
index 02abf6449b..286e878d9b 100644
--- a/src/modules/app/server-app.module.ts
+++ b/src/modules/app/server-app.module.ts
@@ -22,6 +22,8 @@ import { Angulartics2GoogleAnalytics } from 'angulartics2/ga';
 import { AngularticsMock } from '../../app/shared/mocks/mock-angulartics.service';
 import { SubmissionService } from '../../app/submission/submission.service';
 import { ServerSubmissionService } from '../../app/submission/server-submission.service';
+import { Angulartics2DSpace } from '../../app/statistics/angulartics/dspace-provider';
+import { Angulartics2Module } from 'angulartics2';
 
 export function createTranslateLoader() {
   return new TranslateJson5UniversalLoader('dist/assets/i18n/', '.json5');
@@ -45,6 +47,7 @@ export function createTranslateLoader() {
         deps: []
       }
     }),
+    Angulartics2Module.forRoot(),
     ServerModule,
     AppModule
   ],
@@ -53,6 +56,10 @@ export function createTranslateLoader() {
       provide: Angulartics2GoogleAnalytics,
       useClass: AngularticsMock
     },
+    {
+      provide: Angulartics2DSpace,
+      useClass: AngularticsMock
+    },
     {
       provide: AuthService,
       useClass: ServerAuthService
diff --git a/themes/mantis/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss b/themes/mantis/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
deleted file mode 100644
index 42b8e0205b..0000000000
--- a/themes/mantis/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@import 'src/app/+search-page/search-filters/search-filter/search-range-filter/search-range-filter.component.scss';
-
-::ng-deep .noUi-connect {
-    background: $info;
-}
diff --git a/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html b/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
index 99d92d2af8..907f70b941 100644
--- a/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
+++ b/themes/mantis/app/entity-groups/journal-entities/item-pages/journal-volume/journal-volume.component.html
@@ -4,7 +4,7 @@
 
             <div class="col-12 col-md-2 d-flex flex-md-column justify-content-between">
                 <ds-metadata-field-wrapper>
-                    <ds-thumbnail [thumbnail]="item.getThumbnail() | async"></ds-thumbnail>
+                    <ds-thumbnail [thumbnail]="object.getThumbnail() | async"></ds-thumbnail>
                 </ds-metadata-field-wrapper>
                 <div>
                     <a class="btn btn-secondary"
diff --git a/themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html b/themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
index 1b8a283da9..089511804e 100644
--- a/themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
+++ b/themes/mantis/app/entity-groups/journal-entities/item-pages/journal/journal.component.html
@@ -61,7 +61,10 @@
     <div class="container search-container">
         <h3 class="h2">{{"item.page.journal.search.title" | translate}}</h3>
     </div>
-    <ds-related-entities-search [item]="object"
-                                [relationType]="'isJournalOfPublication'">
-    </ds-related-entities-search>
+    <ds-tabbed-related-entities-search  [item]="object"
+                                        [relationTypes]="[{
+                                            label: 'isJournalOfPublication',
+                                            filter: 'isJournalOfPublication'
+                                          }]">
+    </ds-tabbed-related-entities-search>
 </div>
diff --git a/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html b/themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
similarity index 79%
rename from themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html
rename to themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
index 15529a1bd5..ee78d9c653 100644
--- a/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.html
+++ b/themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.html
@@ -53,18 +53,6 @@
 <div class="relationships-item-page">
     <div class="container">
         <div class="row">
-            <ds-related-items
-              class="col-12 col-md-4"
-              [parentItem]="object"
-              [relationType]="'isPersonOfOrgUnit'"
-              [label]="'relationships.isPersonOf' | translate">
-            </ds-related-items>
-            <ds-related-items
-              class="col-12 col-md-4"
-              [parentItem]="object"
-              [relationType]="'isProjectOfOrgUnit'"
-              [label]="'relationships.isProjectOf' | translate">
-            </ds-related-items>
             <ds-related-items
               class="col-12 col-md-4"
               [parentItem]="object"
@@ -74,3 +62,20 @@
         </div>
     </div>
 </div>
+<div class="container">
+  <div class="row">
+    <ds-tabbed-related-entities-search  class="w-100"
+                                        [item]="object"
+                                        [relationTypes]="[{
+                                            label: 'isOrgUnitOfPerson',
+                                            filter: 'isOrgUnitOfPerson',
+                                            configuration: 'person'
+                                          },
+                                          {
+                                            label: 'isOrgUnitOfProject',
+                                            filter: 'isOrgUnitOfProject',
+                                            configuration: 'project'
+                                          }]">
+    </ds-tabbed-related-entities-search>
+  </div>
+</div>
diff --git a/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.scss b/themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss
similarity index 86%
rename from themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.scss
rename to themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss
index 54651aede0..4a1d2516da 100644
--- a/themes/mantis/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.scss
+++ b/themes/mantis/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss
@@ -1,4 +1,4 @@
-@import 'src/app/entity-groups/research-entities/item-pages/orgunit/orgunit.component.scss';
+@import 'src/app/entity-groups/research-entities/item-pages/org-unit/org-unit.component.scss';
 
 :host {
     > * {
diff --git a/themes/mantis/app/entity-groups/research-entities/item-pages/person/person.component.html b/themes/mantis/app/entity-groups/research-entities/item-pages/person/person.component.html
index bb5cb1b787..1679f9354d 100644
--- a/themes/mantis/app/entity-groups/research-entities/item-pages/person/person.component.html
+++ b/themes/mantis/app/entity-groups/research-entities/item-pages/person/person.component.html
@@ -79,7 +79,10 @@
     <div class="container search-container">
         <h3 class="h2">{{"item.page.person.search.title" | translate}}</h3>
     </div>
-<ds-related-entities-search [item]="object"
-                            [relationType]="'isAuthorOfPublication'">
-</ds-related-entities-search>
+<ds-tabbed-related-entities-search  [item]="object"
+                                    [relationTypes]="[{
+                                        label: 'isAuthorOfPublication',
+                                        filter: 'isAuthorOfPublication'
+                                      }]">
+</ds-tabbed-related-entities-search>
 </div>
diff --git a/themes/mantis/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html b/themes/mantis/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
similarity index 100%
rename from themes/mantis/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
rename to themes/mantis/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-option/search-facet-option.component.html
diff --git a/themes/mantis/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html b/themes/mantis/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
similarity index 100%
rename from themes/mantis/app/+search-page/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
rename to themes/mantis/app/shared/search/search-filters/search-filter/search-facet-filter-options/search-facet-range-option/search-facet-range-option.component.html
diff --git a/themes/mantis/app/+search-page/search-filters/search-filter/search-filter.component.html b/themes/mantis/app/shared/search/search-filters/search-filter/search-filter.component.html
similarity index 100%
rename from themes/mantis/app/+search-page/search-filters/search-filter/search-filter.component.html
rename to themes/mantis/app/shared/search/search-filters/search-filter/search-filter.component.html
diff --git a/themes/mantis/app/+search-page/search-filters/search-filter/search-filter.component.scss b/themes/mantis/app/shared/search/search-filters/search-filter/search-filter.component.scss
similarity index 61%
rename from themes/mantis/app/+search-page/search-filters/search-filter/search-filter.component.scss
rename to themes/mantis/app/shared/search/search-filters/search-filter/search-filter.component.scss
index 8e9b1d32b1..4d2d29ae41 100644
--- a/themes/mantis/app/+search-page/search-filters/search-filter/search-filter.component.scss
+++ b/themes/mantis/app/shared/search/search-filters/search-filter/search-filter.component.scss
@@ -1,4 +1,4 @@
-@import 'src/app/+search-page/search-filters/search-filter/search-filter.component.scss';
+@import 'src/app/shared/search/search-filters/search-filter/search-filter.component.scss';
 
 .facet-filter {
     background-color: map-get($theme-colors, light);
diff --git a/themes/mantis/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss b/themes/mantis/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
new file mode 100644
index 0000000000..7edcb8f063
--- /dev/null
+++ b/themes/mantis/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss
@@ -0,0 +1,5 @@
+@import 'src/app/shared/search/search-filters/search-filter/search-range-filter/search-range-filter.component.scss';
+
+::ng-deep .noUi-connect {
+    background: $info;
+}
diff --git a/themes/mantis/app/+search-page/search-filters/search-filters.component.html b/themes/mantis/app/shared/search/search-filters/search-filters.component.html
similarity index 100%
rename from themes/mantis/app/+search-page/search-filters/search-filters.component.html
rename to themes/mantis/app/shared/search/search-filters/search-filters.component.html
diff --git a/themes/mantis/app/+search-page/search-settings/search-settings.component.html b/themes/mantis/app/shared/search/search-settings/search-settings.component.html
similarity index 100%
rename from themes/mantis/app/+search-page/search-settings/search-settings.component.html
rename to themes/mantis/app/shared/search/search-settings/search-settings.component.html
diff --git a/themes/mantis/app/+search-page/search-settings/search-settings.component.scss b/themes/mantis/app/shared/search/search-settings/search-settings.component.scss
similarity index 65%
rename from themes/mantis/app/+search-page/search-settings/search-settings.component.scss
rename to themes/mantis/app/shared/search/search-settings/search-settings.component.scss
index 602c8ca4c3..073039dae8 100644
--- a/themes/mantis/app/+search-page/search-settings/search-settings.component.scss
+++ b/themes/mantis/app/shared/search/search-settings/search-settings.component.scss
@@ -1,4 +1,4 @@
-@import 'src/app/+search-page/search-settings/search-settings.component.scss';
+@import 'src/app/shared/search/search-settings/search-settings.component.scss';
 
 .setting-option {
     background-color: map-get($theme-colors, light);
diff --git a/tslint.json b/tslint.json
index b4f905d324..51edf5e1d7 100644
--- a/tslint.json
+++ b/tslint.json
@@ -40,7 +40,7 @@
     ],
     "no-access-missing-member": false,
     "no-arg": true,
-    "no-attribute-parameter-decorator": true,
+    "no-attribute-decorator": true,
     "no-bitwise": true,
     "no-console": [
       true,
@@ -81,9 +81,8 @@
       false
     ],
     "prefer-const": true,
-    "pipe-naming": [
+    "pipe-prefix": [
       true,
-      "camelCase",
       "ds"
     ],
     "quotemark": [
@@ -114,6 +113,13 @@
         "parameter": "nospace",
         "property-declaration": "nospace",
         "variable-declaration": "nospace"
+      },
+      {
+        "call-signature": "onespace",
+        "index-signature": "onespace",
+        "parameter": "onespace",
+        "property-declaration": "onespace",
+        "variable-declaration": "onespace"
       }
     ],
     "unified-signatures": true,
@@ -147,10 +153,10 @@
     "no-input-rename": true,
     "no-output-rename": true,
     "templates-use-public": false,
-    "use-host-property-decorator": true,
-    "use-input-property-decorator": true,
+    "no-host-metadata-property": true,
+    "no-inputs-metadata-property": true,
     "use-life-cycle-interface": false,
-    "use-output-property-decorator": true,
+    "no-outputs-metadata-property": true,
     "use-pipe-transform-interface": true
 //    "rxjs-collapse-imports": true,
 //    "rxjs-pipeable-operators-only": true,
diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js
index 028815d958..2024319991 100644
--- a/webpack/webpack.common.js
+++ b/webpack/webpack.common.js
@@ -15,6 +15,9 @@ module.exports = (env) => {
   let copyWebpackOptions = [{
     from: path.join(__dirname, '..', 'node_modules', '@fortawesome', 'fontawesome-free', 'webfonts'),
     to: path.join('assets', 'fonts')
+  }, {
+    from: path.join(__dirname, '..', 'resources', 'fonts'),
+    to: path.join('assets', 'fonts')
   }, {
     from: path.join(__dirname, '..', 'resources', 'images'),
     to: path.join('assets', 'images')
@@ -24,6 +27,15 @@ module.exports = (env) => {
   }
   ];
 
+  const themeFonts = path.join(themePath, 'resources', 'fonts');
+  if(theme && fs.existsSync(themeFonts)) {
+    copyWebpackOptions.push({
+      from: themeFonts,
+      to: path.join('assets', 'fonts')  ,
+      force: true,
+    });
+  }
+
   const themeImages = path.join(themePath, 'resources', 'images');
   if(theme && fs.existsSync(themeImages)) {
     copyWebpackOptions.push({
@@ -107,12 +119,6 @@ module.exports = (env) => {
                                 sourceMap: true
                             }
                         },
-                        {
-                            loader: 'resolve-url-loader',
-                            options: {
-                                sourceMap: true
-                            }
-                        },
                         {
                             loader: 'sass-loader',
                             options: {
@@ -145,12 +151,6 @@ module.exports = (env) => {
                                 sourceMap: true
                             }
                         },
-                        {
-                            loader: 'resolve-url-loader',
-                            options: {
-                                sourceMap: true
-                            }
-                        },
                         {
                             loader: 'sass-loader',
                             options: {
@@ -161,7 +161,7 @@ module.exports = (env) => {
                     ]
                 },
                 {
-                    test: /\.html$/,
+                    test: /\.(html|eot|ttf|otf|svg|woff|woff2)$/,
                     loader: 'raw-loader'
                 }
             ]
diff --git a/webpack/webpack.prod.js b/webpack/webpack.prod.js
index df0d6274d9..78032e1cfb 100644
--- a/webpack/webpack.prod.js
+++ b/webpack/webpack.prod.js
@@ -1,7 +1,7 @@
 const webpack = require('webpack');
 const BundleAnalyzerPlugin = require('webpack-bundle-analyzer').BundleAnalyzerPlugin;
 const CompressionPlugin = require("compression-webpack-plugin");
-const UglifyJsPlugin = require('uglifyjs-webpack-plugin');
+const TerserPlugin = require('terser-webpack-plugin');
 const OptimizeCSSAssetsPlugin = require("optimize-css-assets-webpack-plugin");
 const cssnano = require("cssnano");
 
@@ -29,7 +29,7 @@ module.exports = {
 
 
     new CompressionPlugin({
-      asset: "[path].gz[query]",
+      filename: "[path].gz[query]",
       algorithm: "gzip",
       test: /\.js$|\.css$|\.html$/,
       threshold: 10240,
@@ -39,15 +39,14 @@ module.exports = {
   ],
   optimization: {
     minimizer: [
-      new UglifyJsPlugin({
-        uglifyOptions: {
+      new TerserPlugin({
+        terserOptions: {
           beautify: false,
           mangle: false,
           output: {
             comments: false
           },
           compress: {
-            warnings: false,
             conditionals: false,
             unused: true,
             comparisons: true,
@@ -58,7 +57,8 @@ module.exports = {
             join_vars: true,
             negate_iife: true
           },
-          sourceMap: true
+          sourceMap: true,
+          warnings: false
         }
       }),
       new OptimizeCSSAssetsPlugin({
diff --git a/webpack/webpack.test.js b/webpack/webpack.test.js
index 83e6e44e79..ef9544b486 100644
--- a/webpack/webpack.test.js
+++ b/webpack/webpack.test.js
@@ -160,12 +160,6 @@ module.exports = function (env) {
                                 sourceMap: true
                             }
                         },
-                        {
-                            loader: 'resolve-url-loader',
-                            options: {
-                                sourceMap: true
-                            }
-                        },
                         {
                             loader: 'sass-loader',
                             options: {
@@ -198,12 +192,6 @@ module.exports = function (env) {
                                 sourceMap: true
                             }
                         },
-                        {
-                            loader: 'resolve-url-loader',
-                            options: {
-                                sourceMap: true
-                            }
-                        },
                         {
                             loader: 'sass-loader',
                             options: {
diff --git a/yarn.lock b/yarn.lock
index 69f4a072ae..2d34ac734d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,13 +2,84 @@
 # yarn lockfile v1
 
 
-"@angular-devkit/architect@0.7.5":
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.7.5.tgz#e2d856b671fe8b0615db1efc144a7f75b55fb6e1"
-  integrity sha512-zwCpGdx3JDE+Y+LiWh9ErRX+fpFPTRHtEd2PDJmfQsdlIWfjxSR5U9vi3+bSRW2n6IFiH2GCYMS31R64rfMwbg==
+"@angular-devkit/architect@0.13.9":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/architect/-/architect-0.13.9.tgz#8bbca4b968fccbf88fc2f86542cbee09e1256e1f"
+  integrity sha512-EAFtCs9dsGhpMRC45PoYsrkiExpWz9Ax15qXfzwdDRacz5DmdOVt+QpkLW1beUOwiyj/bhFyj23eaONK2RTn/w==
   dependencies:
-    "@angular-devkit/core" "0.7.5"
-    rxjs "^6.0.0"
+    "@angular-devkit/core" "7.3.9"
+    rxjs "6.3.3"
+
+"@angular-devkit/build-angular@^0.13.5":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-angular/-/build-angular-0.13.9.tgz#92ef7b55a1aa055b2f5c8ffed4bdb04df86db678"
+  integrity sha512-onh07LhdxotDFjja0KKsDWNCwgpM/ymuRr5h0e+vT4AgklP2Uioz1CpzVOgxPIKkdVdGR9QgDinVsWAmY90J8g==
+  dependencies:
+    "@angular-devkit/architect" "0.13.9"
+    "@angular-devkit/build-optimizer" "0.13.9"
+    "@angular-devkit/build-webpack" "0.13.9"
+    "@angular-devkit/core" "7.3.9"
+    "@ngtools/webpack" "7.3.9"
+    ajv "6.9.1"
+    autoprefixer "9.4.6"
+    circular-dependency-plugin "5.0.2"
+    clean-css "4.2.1"
+    copy-webpack-plugin "4.6.0"
+    file-loader "3.0.1"
+    glob "7.1.3"
+    istanbul-instrumenter-loader "3.0.1"
+    karma-source-map-support "1.3.0"
+    less "3.9.0"
+    less-loader "4.1.0"
+    license-webpack-plugin "2.1.0"
+    loader-utils "1.2.3"
+    mini-css-extract-plugin "0.5.0"
+    minimatch "3.0.4"
+    open "6.0.0"
+    parse5 "4.0.0"
+    postcss "7.0.14"
+    postcss-import "12.0.1"
+    postcss-loader "3.0.0"
+    raw-loader "1.0.0"
+    rxjs "6.3.3"
+    sass-loader "7.1.0"
+    semver "5.6.0"
+    source-map-loader "0.2.4"
+    source-map-support "0.5.10"
+    speed-measure-webpack-plugin "1.3.1"
+    stats-webpack-plugin "0.7.0"
+    style-loader "0.23.1"
+    stylus "0.54.5"
+    stylus-loader "3.0.2"
+    terser-webpack-plugin "1.2.2"
+    tree-kill "1.2.1"
+    webpack "4.29.0"
+    webpack-dev-middleware "3.5.1"
+    webpack-dev-server "3.1.14"
+    webpack-merge "4.2.1"
+    webpack-sources "1.3.0"
+    webpack-subresource-integrity "1.1.0-rc.6"
+  optionalDependencies:
+    node-sass "4.12.0"
+
+"@angular-devkit/build-optimizer@0.13.9":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.13.9.tgz#05a25ca7743876987158881585c55dfc478b95bd"
+  integrity sha512-GQtCntthQHSBv5l1ZY5p00JOECb/WcE1qUBo5kFjp84z0fszDkhOy52M1kcWCX4PFzJaY4DKk58hbUE/2UN0jw==
+  dependencies:
+    loader-utils "1.2.3"
+    source-map "0.5.6"
+    typescript "3.2.4"
+    webpack-sources "1.3.0"
+
+"@angular-devkit/build-webpack@0.13.9":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-webpack/-/build-webpack-0.13.9.tgz#9fa091d778db752c539e1c585e21ba47d7054672"
+  integrity sha512-6ypu6pzNmQxzATF4rTWEhGSl5hyGQ8a/3aCZF/ux+XGc3d4hi2HW+NWlDm1UEna6ZjNtgEPlgfP4q8BKrjRmfA==
+  dependencies:
+    "@angular-devkit/architect" "0.13.9"
+    "@angular-devkit/core" "7.3.9"
+    rxjs "6.3.3"
 
 "@angular-devkit/core@0.7.5":
   version "0.7.5"
@@ -20,6 +91,17 @@
     rxjs "^6.0.0"
     source-map "^0.5.6"
 
+"@angular-devkit/core@7.3.9":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/core/-/core-7.3.9.tgz#bef2aaa0be7219c546fb99ea0ba9dd3a6dcd288a"
+  integrity sha512-SaxD+nKFW3iCBKsxNR7+66J30EexW/y7tm8m5AvUH+GwSAgIj0ZYmRUzFEPggcaLVA4WnE/YWqIXZMJW5dT7gw==
+  dependencies:
+    ajv "6.9.1"
+    chokidar "2.0.4"
+    fast-json-stable-stringify "2.0.0"
+    rxjs "6.3.3"
+    source-map "0.7.3"
+
 "@angular-devkit/schematics@0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-0.7.5.tgz#f46b121f29cb40ad6095285d27a515114a56c5d6"
@@ -28,101 +110,128 @@
     "@angular-devkit/core" "0.7.5"
     rxjs "^6.0.0"
 
-"@angular/animations@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-6.1.6.tgz#25a9cd87303aec5556c20631d087447de2330e87"
-  integrity sha512-fK7onQeVsPgUx/sFcBvcGisuIuxvodzATpoKV9SnsQc6xWE5qsvJRZijrzZIN+Hxy/DgsLaVWRCPn1hG75/D2Q==
+"@angular-devkit/schematics@7.3.9":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/schematics/-/schematics-7.3.9.tgz#4fe7bc878b116b157a3adf00583c28c951215877"
+  integrity sha512-xzROGCYp7aQbeJ3V6YC0MND7wKEAdWqmm/GaCufEk0dDS8ZGe0sQhcM2oBRa2nQqGQNeThFIH51kx+FayrJP0w==
+  dependencies:
+    "@angular-devkit/core" "7.3.9"
+    rxjs "6.3.3"
+
+"@angular/animations@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-7.2.15.tgz#980c1f523a79d4b7cb44508f57fba06f2e0872fa"
+  integrity sha512-8oBt3HLgd2+kyJHUgsd7OzKCCss67t2sch15XNoIWlOLfxclqU+EfFE6t/vCzpT8/+lpZS6LU9ZrTnb+UBj5jg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/cli@^6.1.5":
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-6.1.5.tgz#312c062631285ff06fd07ecde8afe22cdef5a0e1"
-  integrity sha512-QNVUSC8mPdiaxubneqNZISy+wec3gwbKoXjcaQ9/45baOnp662j2iJXwiMh6Atn0YUM4u1iUsz1uHyARMtgZmw==
+"@angular/cdk@7.3.7":
+  version "7.3.7"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-7.3.7.tgz#ce1ad53ba04beb9c8e950acc5691ea0143753764"
+  integrity sha512-xbXxhHHKGkVuW6K7pzPmvpJXIwpl0ykBnvA2g+/7Sgy5Pd35wCC+UtHD9RYczDM/mkygNxMQtagyCErwFnDtQA==
   dependencies:
-    "@angular-devkit/architect" "0.7.5"
-    "@angular-devkit/core" "0.7.5"
-    "@angular-devkit/schematics" "0.7.5"
-    "@schematics/angular" "0.7.5"
-    "@schematics/update" "0.7.5"
-    opn "^5.3.0"
-    rxjs "^6.0.0"
-    semver "^5.1.0"
-    symbol-observable "^1.2.0"
-    yargs-parser "^10.0.0"
+    tslib "^1.7.1"
+  optionalDependencies:
+    parse5 "^5.0.0"
 
-"@angular/common@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-6.1.6.tgz#16597d89dddd72a606d3cc7125ffa30a87f5ee09"
-  integrity sha512-aFQcfCB2vFfNqR6/e6R34JjFpIFmF3zqr6Ubti1PJOsRuhITZHG/qRYIYA7mh1KVkkf0VXC56B+8QzYbdGcKOQ==
+"@angular/cli@^7.3.5":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@angular/cli/-/cli-7.3.9.tgz#0366b5a66654c1f02ab2f3a9f15ebde446d506a4"
+  integrity sha512-7oJj7CKDlFUbQav1x1CV4xKKcbt0pnxY4unKcm7Q1tVXhu8bU2bc3cDA0aJnbofcYb6TJcd/C2qHgCt78q7edA==
+  dependencies:
+    "@angular-devkit/architect" "0.13.9"
+    "@angular-devkit/core" "7.3.9"
+    "@angular-devkit/schematics" "7.3.9"
+    "@schematics/angular" "7.3.9"
+    "@schematics/update" "0.13.9"
+    "@yarnpkg/lockfile" "1.1.0"
+    ini "1.3.5"
+    inquirer "6.2.1"
+    npm-package-arg "6.1.0"
+    open "6.0.0"
+    pacote "9.4.0"
+    semver "5.6.0"
+    symbol-observable "1.2.0"
+
+"@angular/common@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-7.2.15.tgz#e6c2f6913cdc49f87adcaabc30604e721561374b"
+  integrity sha512-2b5JY2HWVHCf3D1GZjmde7jdAXSTXkYtmjLtA9tQkjOOTr80eHpNSujQqnzb97dk9VT9OjfjqTQd7K3pxZz8jw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/compiler-cli@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-6.1.6.tgz#cccebfaf66af3b7c19dd528732b945ce378bd65f"
-  integrity sha512-CvgQXuuUJDfmCwnuhZec41aMAiY7nJMSMJxvZWNbFLRiwq+05LiHc7EJYDc6uVQmddWmSqGwfyghjVaiaKJGMg==
+"@angular/compiler-cli@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-7.2.15.tgz#25cc3a6556ba726d00c4992ad894f8db203f4fbc"
+  integrity sha512-+AsfyKawmj/sa+m4Pz8VSRFbCfx/3IOjAuuEjhopbyr154YpPDSu8NTbcwzq3yfbVcPwK4/4exmbQzpsndaCTg==
   dependencies:
-    chokidar "^1.4.2"
+    canonical-path "1.0.0"
+    chokidar "^2.1.1"
+    convert-source-map "^1.5.1"
+    dependency-graph "^0.7.2"
+    magic-string "^0.25.0"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    tsickle "^0.32.1"
+    shelljs "^0.8.1"
+    source-map "^0.6.1"
+    tslib "^1.9.0"
+    yargs "9.0.1"
 
-"@angular/compiler@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-6.1.6.tgz#2c858fe78ad1ca5bb3c886bd638bbb144af36e06"
-  integrity sha512-Z9Og0DVH5krG/xMhfcRJMr5GF2HzqnG3f6Hr+e6d6FB8oehnCX/w9b34zZfVGUWAydAYj32SpXJLE6fQm/ljzA==
+"@angular/compiler@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-7.2.15.tgz#9698dac49dbb46956f0b8a6280580025ea7ab04e"
+  integrity sha512-5yb4NcLk8GuXkYf7Dcor4XkGueYp4dgihzDmMjYDUrV0NPhubKlr+SwGtLOtzgRBWJ1I2bO0S3zwa0q0OgIPOw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/core@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-6.1.6.tgz#130758ad49cad5f6f075693f6496bbc7d510db3b"
-  integrity sha512-RFkxNDq8iIfO1SaOuUYqOGD/pujMqifJ9FeVg8M2v7ucW01coXAG0IwqUEMMShQj3GGJGHj+F9BNswN7aD2uvw==
+"@angular/core@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-7.2.15.tgz#c00d4be0ebe95b70f7631154169509cc97934e9a"
+  integrity sha512-XsuYm0jEU/mOqwDOk2utThv8J9kESkAerfuCHClE9rB2TtHUOGCfekF7lJWqjjypu6/J9ygoPFo7hdAE058ZGg==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/forms@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-6.1.6.tgz#1c4936993f2dbcee516cb547a534da3c70f84b76"
-  integrity sha512-6ddk8bhsEtSONctj9PUrEJnTTRL1xHCULaxo2N4GQh5XyV8ScRM0ewOTLcpoL0IU4lgtQmU0VsLWdQvKr3g3Ng==
+"@angular/forms@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-7.2.15.tgz#6b6e10b5f4687b6be3081abcc02a055b3ceeb6d8"
+  integrity sha512-p0kcIQLtBBC1qeTA6M3nOuXf/k91E80FKquVM9zEsO2kDjI0oZJVfFYL2UMov5samlJOPN+t6lRHEIUa7ApPsw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/http@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/http/-/http-6.1.6.tgz#4e4b74a9746b14ebd5fd0071a5a3299e945ba2ad"
-  integrity sha512-V4qF68tUSsc3cKvQERJmpfXgZSKgxhb67I2jAfmwU9mEH66wh9FNfZ0b0GPV9hXoCulw3POz4ZUwZZ1E6mLy4A==
+"@angular/http@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/http/-/http-7.2.15.tgz#a32bea9e67e99eef88150085aeebbe7aeecd39eb"
+  integrity sha512-TR7PEdmLWNIre3Zn8lvyb4lSrvPUJhKLystLnp4hBMcWsJqq5iK8S3bnlR4viZ9HMlf7bW7+Hm4SI6aB3tdUtw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser-dynamic@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-6.1.6.tgz#49c2048d61b6d0958b2f0deb68cebe638b2f7f63"
-  integrity sha512-Ep4vq2ssb1r8XOAw7dJW530vzFKKVY5fj0CYp7VMPfDkwYolEG4TBKQ/ouJkF8n/jdDVFP73+MzU1TLa9/lMQQ==
+"@angular/platform-browser-dynamic@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-7.2.15.tgz#e697159b565ef78bd7d276fa876d099172ad8735"
+  integrity sha512-UL2PqhzXMD769NQ6Lh6pxlBDKvN9Qol3XLRFil80lwJ1GRW16ITeYbCamcafIH2GOyd88IhmYcbMfUQ/6q4MMQ==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-browser@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-6.1.6.tgz#9a9498aa455978e974436000ddde8af9f64eef13"
-  integrity sha512-fwI/w+MhdolVJEfdoCSZFarQo+SctG1pNa+V3PxMkXhxnAbv7oWPQdxzdCrhTWdxJTJ5enSfumMmlJEZtg1bag==
+"@angular/platform-browser@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-7.2.15.tgz#d6df74c427453e563c12bc2ec03a83bf10bb3805"
+  integrity sha512-aYgmPsbC9Tvp9vmKWD8voeAp4crwCay7/D6lM3ClEe2EeK934LuEXq3/uczMrFVbnIX7BBIo8fh03Tl7wbiGPw==
   dependencies:
     tslib "^1.9.0"
 
-"@angular/platform-server@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-6.1.6.tgz#a3c817421826bd1afa1a1bad9859bb3fa1fbf24c"
-  integrity sha512-qg2eqfbks8Ssv+LEGfT/VcatDrZ7RX3/t0ASnZPzS3vMkqIvtOyZdl+GuhSFPHSQlq4HQ4YwCM48MzYJ+xQ19A==
+"@angular/platform-server@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-7.2.15.tgz#06c8a4c1850da6289f643bd690fc7e1e8bdd6376"
+  integrity sha512-a7XhYlbmQ7pN6liFq8WqdX4GNoxCIXhlZqotZkfwJDsDy2E2yyvVx6BYCEOnSRvO9xXwfyBXiLfZ4Y2A7xeCoQ==
   dependencies:
-    domino "^2.0.1"
+    domino "^2.1.0"
     tslib "^1.9.0"
     xhr2 "^0.1.4"
 
-"@angular/router@^6.1.4":
-  version "6.1.6"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-6.1.6.tgz#d280e014e5b4399d9631ac9cfd3dfde0cf3f76ed"
-  integrity sha512-fOFeOe3uBrSRUYhXdWxHjDPf80eq3ZNCeWfujzfBADtcmiezlO7cxc1v5Eu81t577frU/3z+w8JvmF257p4RZg==
+"@angular/router@^7.2.15":
+  version "7.2.15"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-7.2.15.tgz#b2acbd07c17158801006cdd7e93113d6ec1f116e"
+  integrity sha512-qAubRJRQanguUqJQ76J9GSZ4JFtoyhJKRmX5P23ANZJXpB6YLzF2fJmOGi+E6cV8F0tKBMEq1pjxFTisx0MXwQ==
   dependencies:
     tslib "^1.9.0"
 
@@ -147,6 +256,21 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
+"@babel/runtime-corejs3@^7.7.4":
+  version "7.7.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.7.6.tgz#5b1044ea11b659d288f77190e19c62da959ed9a3"
+  integrity sha512-NrRUehqG0sMSCaP+0XV/vOvvjNl4BQOWq3Qys1Q2KTEm5tGMo9h0dHnIzeKerj0a7SIB8LP5kYg/T1raE3FoKQ==
+  dependencies:
+    core-js-pure "^3.0.0"
+    regenerator-runtime "^0.13.2"
+
+"@babel/runtime@^7.7.4":
+  version "7.7.6"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.7.6.tgz#d18c511121aff1b4f2cd1d452f1bac9601dd830f"
+  integrity sha512-BWAJxpNVa0QlE5gZdWjSxXtemZyZ9RmrmVozxt3NUXeZhVIJ5ANyqmMc0JDrivBZyxUuQvFxlvH4OWWOogGfUw==
+  dependencies:
+    regenerator-runtime "^0.13.2"
+
 "@fortawesome/fontawesome-free@^5.5.0":
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free/-/fontawesome-free-5.5.0.tgz#0c6c53823d04457ae669cd19567b8a21dbb4fcfd"
@@ -160,77 +284,84 @@
     call-me-maybe "^1.0.1"
     glob-to-regexp "^0.3.0"
 
-"@ng-bootstrap/ng-bootstrap@^2.0.0":
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-2.2.2.tgz#07c64badd48b563140eb5a6327b5516bf2226834"
-  integrity sha512-uqngK1urcevQeF+zgoGW1XDnasjoob4QrwhynNUFpDnnplP1wa+BEUjpSccxU+L2dHLfrOb2sPGEGp8cE2X3Iw==
-
-"@ng-dynamic-forms/core@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/core/-/core-6.2.0.tgz#85cd361d5e54d0fb394e9de9b887f8692d5b4c29"
-  integrity sha512-c5BzFK7pE6Wo4MdOSrkI6TOtoV3fYSAljKVtyKFR4JRiK6V3yxFiVuY1Ww96urYjhgBzChyqUaDDR6nVUPaYxw==
-
-"@ng-dynamic-forms/ui-ng-bootstrap@6.2.0":
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/ui-ng-bootstrap/-/ui-ng-bootstrap-6.2.0.tgz#cd8e65472eaa4c0068d4ab453f84cab9d3b38a1c"
-  integrity sha512-zyieF2HvUuxqLUA4fYA9OJPMBokJIUjcVnZCPdy4sH/vP6jhMR0mCdvG/WWCn8CNRSgIQUmKTyqv4FKHunJYGw==
-
-"@ngrx/effects@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-6.1.0.tgz#3c1e1ab1e5a86c6d9c29d4f3771e42cc9bd8576c"
-  integrity sha512-euR/VHn0cEOkdZ3SqCzUvYHT0P5FcTBm4/xSE8gH85ORP0//owD3L6o8X3etfWLRS+BAELk1JcXkFeAVG9CXiQ==
-
-"@ngrx/entity@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@ngrx/entity/-/entity-6.1.0.tgz#9ea34beef25e458b45638095875b2548d484df9f"
-  integrity sha512-hUi+ejnyCtK1vYQHq1mvrkp0mxzqvw9kxluuzOQkb89A3JruBOFBV/TwpXNo8EU+FJZ+SacZoEDadBuZKkIA5g==
-
-"@ngrx/router-store@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-6.1.0.tgz#a225de3fbb262429561d722e139dde7efdcf0cea"
-  integrity sha512-uMC0TykeVi0fPuX+iwanCAX5mBrb+LHgJGtI4CL+sEjviXe9C/84UDmApoG9Goe0xuCtALqOqGDP0UoNSxVA3g==
-
-"@ngrx/schematics@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@ngrx/schematics/-/schematics-6.1.0.tgz#4e784da5502829700895ca87d4cc5da93bf3ec84"
-  integrity sha512-GEDpJ1jKPxDEerkI2gepzir59ovgF/0S30TXnsVGHLlZ72JFEPwNqpraQzF/zF4qW4QRG2H7LkNkd2PGqMEBSg==
-
-"@ngrx/store-devtools@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-6.1.0.tgz#cf65a3149628dc37badd094204484dde9ba14200"
-  integrity sha512-Uc0g/NCbJIbzvIMuCy3skiZVD5hoIrOAAvaninXkVHt7bXpbsSAdvJlmnozuGQqTbC0UQhYRwAR7InRSrzIbMQ==
-
-"@ngrx/store@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-6.1.0.tgz#5b027647a797bf027912568214b10375dd75af38"
-  integrity sha512-H5BGym1WtAX84/R4pTQ2MrrP87qYfXc6CoPghCZCK9LYxCodsI7KeQfpyNCg5qapxdH2EDqlHXTBJfMTLRiRGg==
-
-"@ngtools/webpack@^6.1.5":
-  version "6.1.5"
-  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-6.1.5.tgz#134639686eb4519885ed27665babdf80ce098263"
-  integrity sha512-vrvFFvUqo4hlrLRBTG7a3gsAneitd0/tj2zHsiN97RmefxHSS+3m0pkVw8G3BMAagp2L42AiVfNV4wvYDe+TXA==
-  dependencies:
-    "@angular-devkit/core" "0.7.5"
-    rxjs "^6.0.0"
-    tree-kill "^1.0.0"
-    webpack-sources "^1.1.0"
-
-"@nguniversal/express-engine@6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-6.1.0.tgz#384d761556a0accc0738ae89b8a63afb43e76a86"
-  integrity sha512-A5v1IF+8S20PBVDwzwOspDZbkb40cWuzZvxPJcqiSSe+B8wCe620AQX+BCJsKsGh0k6z4VEDqEqJLX9SX21Lig==
-
-"@ngx-translate/core@10.0.2":
-  version "10.0.2"
-  resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-10.0.2.tgz#5eeb78f47845b476a1e892fb2fb153dbbaf72850"
-  integrity sha512-7nM3DrJaqKswwtJlbu2kuKNl+hE8Isr18sKsKvGGpSxQk+G0gO0reDlx2PhUNus7TJTkA1C59vU/JoN8hIvZ4g==
+"@ng-bootstrap/ng-bootstrap@^4.1.0":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@ng-bootstrap/ng-bootstrap/-/ng-bootstrap-4.2.2.tgz#a1c3a9576656cb4f793bbc3df56dfbdeb098f2fb"
+  integrity sha512-v8QmC17bv9he5Ep6zutaI9aQ2w/2NqySP0fejOKe7cacKpGUqsLIakpyd2FD7mfZu7pSCCtHYpRWR+h6yq+Ngg==
   dependencies:
     tslib "^1.9.0"
 
-"@ngx-translate/http-loader@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@ngx-translate/http-loader/-/http-loader-3.0.1.tgz#20b0f98bc6c25321129d3e3302ab3cc489c0a42a"
-  integrity sha1-ILD5i8bCUyESnT4zAqs8xInApCo=
+"@ng-dynamic-forms/core@^7.1.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/core/-/core-7.2.0.tgz#788253da5f0bc44ea69cd1eb0071b78f091ea389"
+  integrity sha512-eRb26jDNIXiBla0hzgEpdL1Za9e6RD9phbV9PxzIkNlYKY2+FQowQBPmGBuck21E9okfVkEle2RJ4lUmozV5jw==
+  dependencies:
+    tslib "^1.9.0"
+
+"@ng-dynamic-forms/ui-ng-bootstrap@^7.1.0":
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/@ng-dynamic-forms/ui-ng-bootstrap/-/ui-ng-bootstrap-7.2.0.tgz#b01da1f0a149108218eb0a1e6f26700a6a5bdbb9"
+  integrity sha512-iX6/7p5FK7yCEDxbKRs//JwsklQGx//0LyB4FkzPil7LNjXqJCabA7WS3+lUFZQdYXM0fAcyve+UZJCM7yTZiA==
+  dependencies:
+    tslib "^1.9.0"
+
+"@ngrx/effects@^7.3.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@ngrx/effects/-/effects-7.4.0.tgz#7d1977538cf85e42ab48fd648acdfbc8b52f93d3"
+  integrity sha512-YjgB17WnLCBDPjAkHduKWsLFSGLZryPaTjY3EIvMF+WTRPDlgC5SAv2n7p3YIei6g6IYcEvOwLWBqZHFUXTgBw==
+
+"@ngrx/entity@^7.3.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@ngrx/entity/-/entity-7.4.0.tgz#634cdff1db9629ca0e64c1d6b1e43dc15f4e2ca6"
+  integrity sha512-aFRDTNp6IFkYFlP9gV6hgNgtDYot9KYF8WVbaQTao9ihmdPumMBOCeRttPPiHS/cU41w9nW3xF53NgxQPnEiQA==
+
+"@ngrx/router-store@^7.3.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@ngrx/router-store/-/router-store-7.4.0.tgz#69c085bda3022117169f87ed5753b951de7d376d"
+  integrity sha512-ZpwTO1/ha3pxO7NV3jIfnwipBN1A719IjAOgrcmI8Ut06VH3HY/7JVFTkwLN/FyuHvl4EOlAVYmMAblmrymUWA==
+
+"@ngrx/schematics@^7.3.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@ngrx/schematics/-/schematics-7.4.0.tgz#c430e11e60b4ef9cd60d92569da65b29847bce89"
+  integrity sha512-H0endOV7nYWDaFH7mOJAWFGVymlOYynwjEHZPWeLQFZIFUaekKOrgrHpc+rygu1Hov5ww8lNXHgAunm4vpvwMA==
+
+"@ngrx/store-devtools@^7.3.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@ngrx/store-devtools/-/store-devtools-7.4.0.tgz#5a73469c70322351c4224f4529c5123f587a5997"
+  integrity sha512-ZmPpquprBYUozbLuLMLZzUhI+LnMNGMNg8x1ij9yDxXWQADcJm1Zu7kouYE1r5SoCYxKfwJ3Ia1VQfS3A5S8dw==
+
+"@ngrx/store@^7.3.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/@ngrx/store/-/store-7.4.0.tgz#525a343aa45d7f6ca60f3301a23a27669c14bbce"
+  integrity sha512-kwTUHgfgBeAL4RQBjZO46z9v4Xzg8PXAgY4WwXdt3zUk1tF4ZvijMleFvFRUoiJJfxF/UM6jgIZ/yGrX2dXQuA==
+
+"@ngtools/webpack@7.3.9", "@ngtools/webpack@^7.3.9":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@ngtools/webpack/-/webpack-7.3.9.tgz#db115dba8cc0886d8d822723be4119d3849fb4e3"
+  integrity sha512-+ROpqfCXLdQwfP+UNDLk4p959ZrocpStkdd2Iy9CeOJ8yDkityqpstTwQC3oHzzu/95BiyZ0hrHbM6AsPPIvJg==
+  dependencies:
+    "@angular-devkit/core" "7.3.9"
+    enhanced-resolve "4.1.0"
+    rxjs "6.3.3"
+    tree-kill "1.2.1"
+    webpack-sources "1.3.0"
+
+"@nguniversal/express-engine@^7.1.1":
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/@nguniversal/express-engine/-/express-engine-7.1.1.tgz#9445ccb374dabdadccc8de98ca8a79b536ae14de"
+  integrity sha512-RJ2VATA6s48bYNrAfjnkjUCohpR7ehiOySwGA2vuUIWCWXKDIIPxgmET5ffVHy1a2XdMsOgrQ9Whth7+CxnUgw==
+
+"@ngx-translate/core@11.0.1":
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/@ngx-translate/core/-/core-11.0.1.tgz#cecefad41f06368f5859dac48fec8fcc4485615f"
+  integrity sha512-nBCa1ZD9fAUY/3eskP3Lql2fNg8OMrYIej1/5GRsfcutx9tG/5fZLCv9m6UCw1aS+u4uK/vXjv1ctG/FdMvaWg==
+  dependencies:
+    tslib "^1.9.0"
+
+"@ngx-translate/http-loader@4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@ngx-translate/http-loader/-/http-loader-4.0.0.tgz#8a555248ad4b7d513460fcec9da25b0447962f1d"
+  integrity sha512-x8LumqydWD7eX9yQTAVeoCM9gFUIGVTUjZqbxdAUavAA3qVnk9wCQux7iHLPXpydl8vyQmLoPQR+fFU+DUDOMA==
   dependencies:
     tslib "^1.9.0"
 
@@ -246,7 +377,16 @@
   resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.1.tgz#53f349bb986ab273d601175aa1b25a655ab90ee3"
   integrity sha512-KU/VDjC5RwtDUZiz3d+DHXJF2lp5hB9dn552TXIyptj8SH1vXmR40mG0JgGq03IlYsOgGfcv8xrLpSQ0YUMQdA==
 
-"@schematics/angular@0.7.5", "@schematics/angular@^0.7.5":
+"@schematics/angular@7.3.9":
+  version "7.3.9"
+  resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-7.3.9.tgz#f57baf1cd9588d4f1035974d06fd8f3d54df021a"
+  integrity sha512-B3lytFtFeYNLfWdlrIzvy3ulFRccD2/zkoL0734J+DAGfUz7vbysJ50RwYL46sQUcKdZdvb48ktfu1S8yooP6Q==
+  dependencies:
+    "@angular-devkit/core" "7.3.9"
+    "@angular-devkit/schematics" "7.3.9"
+    typescript "3.2.4"
+
+"@schematics/angular@^0.7.5":
   version "0.7.5"
   resolved "https://registry.yarnpkg.com/@schematics/angular/-/angular-0.7.5.tgz#ccb5ce587161b24042195e100be556ae19b3b7f6"
   integrity sha512-NrtvFwHCoWon8KInsvA1jdPu4pVJGa8GAWM/jqnE7HpwPwM7hMML08lV0P8r3NX5t2/i0CKvfp4AAEr5MXorEQ==
@@ -255,17 +395,19 @@
     "@angular-devkit/schematics" "0.7.5"
     typescript ">=2.6.2 <2.10"
 
-"@schematics/update@0.7.5":
-  version "0.7.5"
-  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.7.5.tgz#c9cc68c4464ea4e29a2f3a7254172df768c86ac4"
-  integrity sha512-pwNkXGtlzyCV6tsTPe8AgUuMCkmubcz94zgL6pSMdEe122yXBcKnr/PKqG9QzD/gGwmOcHUE9EWcuRtU5kdFpA==
+"@schematics/update@0.13.9":
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/@schematics/update/-/update-0.13.9.tgz#60d338676d10d24d1b12812a0624f6e7c3dbcd06"
+  integrity sha512-4MQcaKFxhMzZyE//+DknDh3h3duy3avg2oxSHxdwXlCZ8Q92+4lpegjJcSRiqlEwO4qeJ5XnrjrvzfIiaIZOmA==
   dependencies:
-    "@angular-devkit/core" "0.7.5"
-    "@angular-devkit/schematics" "0.7.5"
-    npm-registry-client "^8.5.1"
-    rxjs "^6.0.0"
-    semver "^5.3.0"
-    semver-intersect "^1.1.2"
+    "@angular-devkit/core" "7.3.9"
+    "@angular-devkit/schematics" "7.3.9"
+    "@yarnpkg/lockfile" "1.1.0"
+    ini "1.3.5"
+    pacote "9.4.0"
+    rxjs "6.3.3"
+    semver "5.6.0"
+    semver-intersect "1.4.0"
 
 "@types/acorn@^4.0.3":
   version "4.0.3"
@@ -306,6 +448,11 @@
   resolved "https://registry.yarnpkg.com/@types/deep-freeze/-/deep-freeze-0.1.1.tgz#0e1ee6ceee06f51baeb663deec0bb7780bd72827"
   integrity sha512-nP6a+Z7pFv8aag1N6XOI68vaM11jjpI6sSig9fPTPDP6cc33gLXbotarnDzjGjoEkXRPWcSGKeTT8qkgh936Pw==
 
+"@types/eslint-visitor-keys@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz#1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"
+  integrity sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==
+
 "@types/estree@*", "@types/estree@0.0.39":
   version "0.0.39"
   resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.39.tgz#e177e699ee1b8c22d23174caaa7422644389509f"
@@ -370,16 +517,21 @@
   resolved "https://registry.yarnpkg.com/@types/highlight.js/-/highlight.js-9.1.8.tgz#d227f18bcb8f3f187e16965f2444859a04689758"
   integrity sha1-0ifxi8uPPxh+FpZfJESFmgRol1g=
 
-"@types/jasmine@^2.8.6":
-  version "2.8.8"
-  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-2.8.8.tgz#bf53a7d193ea8b03867a38bfdb4fbb0e0bf066c9"
-  integrity sha512-OJSUxLaxXsjjhob2DBzqzgrkLmukM3+JMpRp0r0E4HTdT1nwDCWhaswjYxazPij6uOdzHCJfNbDjmQ1/rnNbCg==
+"@types/jasmine@^3.3.9":
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.5.0.tgz#2ad2006c8a937d20df20a8fee86071d0f730ef99"
+  integrity sha512-kGCRI9oiCxFS6soGKlyzhMzDydfcPix9PpTkr7h11huxOxhWwP37Tg7DYBaQ18eQTNreZEuLkhpbGSqVNZPnnw==
 
 "@types/js-cookie@2.1.0":
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/@types/js-cookie/-/js-cookie-2.1.0.tgz#a8916246aa994db646c66d54c854916213300a51"
   integrity sha512-vPT5MV1pD71RFUD0ytp6Yw51W6zKJ9Qn2AcJXSD2TZqYKaXUtCxB3WZIXXFZtbAEVMgC59nmvVPSOH0EIvkaZg==
 
+"@types/json-schema@^7.0.3":
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.3.tgz#bdfd69d61e464dcc81b25159c270d75a73c1a636"
+  integrity sha512-Il2DtDVRGDcqjDtE+rF8iqg1CArehSK84HZJCT7AMITlyXRBpuPhqGLDQMowraqqu1coEaimg4ZOqggt6L6L+A==
+
 "@types/json5@^0.0.30":
   version "0.0.30"
   resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.30.tgz#44cb52f32a809734ca562e685c6473b5754a7818"
@@ -425,10 +577,10 @@
   resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.3.tgz#85f288502503ade0b3bfc049fe1777b05d0327d5"
   integrity sha512-DOzWZKUnmFYG0KUOs+9HEBju2QhBU6oM2zeluunQNt0vnJvnkHvtDNlQPZDkTrkC5pZrNx1TPqeL137zciXZMQ==
 
-"@types/node@^10.9.4":
-  version "10.9.4"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.9.4.tgz#0f4cb2dc7c1de6096055357f70179043c33e9897"
-  integrity sha512-fCHV45gS+m3hH17zgkgADUSi2RR1Vht6wOZ0jyHP8rjiQra9f+mIcgwPQHllmDocYOstIEbKlxbFDYlgrTPYqw==
+"@types/node@^11.11.2":
+  version "11.15.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-11.15.3.tgz#cb7f19846a83ac5a88fc22756b74633cdeb476a7"
+  integrity sha512-5RzvXVietaB8S4dwDjxjltAOHtTO87fiksjqjWGZih97j6KSrdCDaRfmYMNrgrLM87odGBrsTHAl6N3fLraQaw==
 
 "@types/q@^0.0.32":
   version "0.0.32"
@@ -465,6 +617,11 @@
   dependencies:
     "@types/node" "*"
 
+"@types/source-list-map@*":
+  version "0.1.2"
+  resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
+  integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
+
 "@types/stacktrace-js@^0.0.32":
   version "0.0.32"
   resolved "https://registry.yarnpkg.com/@types/stacktrace-js/-/stacktrace-js-0.0.32.tgz#d23e4a36a5073d39487fbea8234cc6186862d389"
@@ -480,11 +637,6 @@
   resolved "https://registry.yarnpkg.com/@types/strip-json-comments/-/strip-json-comments-0.0.30.tgz#9aa30c04db212a9a0649d6ae6fd50accc40748a1"
   integrity sha512-7NQmHra/JILCd1QqpSzl8+mJRc8ZHz3uDm8YV1Ks9IhK0epEiTw8aIErbvH9PI+6XbqhyIQy3462nEsn7UVzjQ==
 
-"@types/tapable@1.0.2":
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.2.tgz#e13182e1b69871a422d7863e11a4a6f5b814a4bd"
-  integrity sha512-42zEJkBpNfMEAvWR5WlwtTH22oDzcMjFsL9gDGExwF8X8WvAiw7Vwop7hPw03QT8TKfec83LwbHj6SvpqM4ELQ==
-
 "@types/uuid@^3.4.3":
   version "3.4.4"
   resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-3.4.4.tgz#7af69360fa65ef0decb41fd150bf4ca5c0cefdf5"
@@ -497,159 +649,374 @@
   resolved "https://registry.yarnpkg.com/@types/webfontloader/-/webfontloader-1.6.29.tgz#c6b5f6eb8ca31d0aae6b02b6c1300349dd93ea8e"
   integrity sha512-wobuM+LvpkzU296NsFVRGDAFWw3X2XEhrLHuvV+VGSbok6aOxQcymmopUFwNB69qy5oudHt9lYC0JF+z+DxFLw==
 
-"@webassemblyjs/ast@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.5.13.tgz#81155a570bd5803a30ec31436bc2c9c0ede38f25"
-  integrity sha512-49nwvW/Hx9i+OYHg+mRhKZfAlqThr11Dqz8TsrvqGKMhdI2ijy3KBJOun2Z4770TPjrIJhR6KxChQIDaz8clDA==
+"@types/webpack-sources@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.5.tgz#be47c10f783d3d6efe1471ff7f042611bd464a92"
+  integrity sha512-zfvjpp7jiafSmrzJ2/i3LqOyTYTuJ7u1KOXlKgDlvsj9Rr0x7ZiYu5lZbXwobL7lmsRNtPXlBfmaUD8eU2Hu8w==
   dependencies:
-    "@webassemblyjs/helper-module-context" "1.5.13"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
-    "@webassemblyjs/wast-parser" "1.5.13"
-    debug "^3.1.0"
+    "@types/node" "*"
+    "@types/source-list-map" "*"
+    source-map "^0.6.1"
+
+"@typescript-eslint/eslint-plugin@^2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.12.0.tgz#0da7cbca7b24f4c6919e9eb31c704bfb126f90ad"
+  integrity sha512-1t4r9rpLuEwl3hgt90jY18wJHSyb0E3orVL3DaqwmpiSDHmHiSspVsvsFF78BJ/3NNG3qmeso836jpuBWYziAA==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "2.12.0"
+    eslint-utils "^1.4.3"
+    functional-red-black-tree "^1.0.1"
+    regexpp "^3.0.0"
+    tsutils "^3.17.1"
+
+"@typescript-eslint/experimental-utils@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.12.0.tgz#e0a76ffb6293e058748408a191921e453c31d40d"
+  integrity sha512-jv4gYpw5N5BrWF3ntROvCuLe1IjRenLy5+U57J24NbPGwZFAjhnM45qpq0nDH1y/AZMb3Br25YiNVwyPbz6RkA==
+  dependencies:
+    "@types/json-schema" "^7.0.3"
+    "@typescript-eslint/typescript-estree" "2.12.0"
+    eslint-scope "^5.0.0"
+
+"@typescript-eslint/parser@^2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.12.0.tgz#393f1604943a4ca570bb1a45bc8834e9b9158884"
+  integrity sha512-lPdkwpdzxEfjI8TyTzZqPatkrswLSVu4bqUgnB03fHSOwpC7KSerPgJRgIAf11UGNf7HKjJV6oaPZI4AghLU6g==
+  dependencies:
+    "@types/eslint-visitor-keys" "^1.0.0"
+    "@typescript-eslint/experimental-utils" "2.12.0"
+    "@typescript-eslint/typescript-estree" "2.12.0"
+    eslint-visitor-keys "^1.1.0"
+
+"@typescript-eslint/typescript-estree@2.12.0":
+  version "2.12.0"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.12.0.tgz#bd9e547ccffd17dfab0c3ab0947c80c8e2eb914c"
+  integrity sha512-rGehVfjHEn8Frh9UW02ZZIfJs6SIIxIu/K1bbci8rFfDE/1lQ8krIJy5OXOV3DVnNdDPtoiPOdEANkLMrwXbiQ==
+  dependencies:
+    debug "^4.1.1"
+    eslint-visitor-keys "^1.1.0"
+    glob "^7.1.6"
+    is-glob "^4.0.1"
+    lodash.unescape "4.0.1"
+    semver "^6.3.0"
+    tsutils "^3.17.1"
+
+"@webassemblyjs/ast@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.7.11.tgz#b988582cafbb2b095e8b556526f30c90d057cace"
+  integrity sha512-ZEzy4vjvTzScC+SH8RBssQUawpaInUdMTYwYYLh54/s8TuT0gBLuyUnppKsVyZEi876VmmStKsUs28UxPgdvrA==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+
+"@webassemblyjs/ast@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.8.5.tgz#51b1c5fe6576a34953bf4b253df9f0d490d9e359"
+  integrity sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==
+  dependencies:
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+
+"@webassemblyjs/floating-point-hex-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.7.11.tgz#a69f0af6502eb9a3c045555b1a6129d3d3f2e313"
+  integrity sha512-zY8dSNyYcgzNRNT666/zOoAyImshm3ycKdoLsyDw/Bwo6+/uktb7p4xyApuef1dwEBo/U/SYQzbGBvV+nru2Xg==
+
+"@webassemblyjs/floating-point-hex-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz#1ba926a2923613edce496fd5b02e8ce8a5f49721"
+  integrity sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==
+
+"@webassemblyjs/helper-api-error@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.7.11.tgz#c7b6bb8105f84039511a2b39ce494f193818a32a"
+  integrity sha512-7r1qXLmiglC+wPNkGuXCvkmalyEstKVwcueZRP2GNC2PAvxbLYwLLPr14rcdJaE4UtHxQKfFkuDFuv91ipqvXg==
+
+"@webassemblyjs/helper-api-error@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz#c49dad22f645227c5edb610bdb9697f1aab721f7"
+  integrity sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==
+
+"@webassemblyjs/helper-buffer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.7.11.tgz#3122d48dcc6c9456ed982debe16c8f37101df39b"
+  integrity sha512-MynuervdylPPh3ix+mKZloTcL06P8tenNH3sx6s0qE8SLR6DdwnfgA7Hc9NSYeob2jrW5Vql6GVlsQzKQCa13w==
+
+"@webassemblyjs/helper-buffer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz#fea93e429863dd5e4338555f42292385a653f204"
+  integrity sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==
+
+"@webassemblyjs/helper-code-frame@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.7.11.tgz#cf8f106e746662a0da29bdef635fcd3d1248364b"
+  integrity sha512-T8ESC9KMXFTXA5urJcyor5cn6qWeZ4/zLPyWeEXZ03hj/x9weSokGNkVCdnhSabKGYWxElSdgJ+sFa9G/RdHNw==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.7.11"
+
+"@webassemblyjs/helper-code-frame@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz#9a740ff48e3faa3022b1dff54423df9aa293c25e"
+  integrity sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==
+  dependencies:
+    "@webassemblyjs/wast-printer" "1.8.5"
+
+"@webassemblyjs/helper-fsm@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.7.11.tgz#df38882a624080d03f7503f93e3f17ac5ac01181"
+  integrity sha512-nsAQWNP1+8Z6tkzdYlXT0kxfa2Z1tRTARd8wYnc/e3Zv3VydVVnaeePgqUzFrpkGUyhUUxOl5ML7f1NuT+gC0A==
+
+"@webassemblyjs/helper-fsm@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz#ba0b7d3b3f7e4733da6059c9332275d860702452"
+  integrity sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==
+
+"@webassemblyjs/helper-module-context@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.7.11.tgz#d874d722e51e62ac202476935d649c802fa0e209"
+  integrity sha512-JxfD5DX8Ygq4PvXDucq0M+sbUFA7BJAv/GGl9ITovqE+idGX+J3QSzJYz+LwQmL7fC3Rs+utvWoJxDb6pmC0qg==
+
+"@webassemblyjs/helper-module-context@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz#def4b9927b0101dc8cbbd8d1edb5b7b9c82eb245"
+  integrity sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
     mamacro "^0.0.3"
 
-"@webassemblyjs/floating-point-hex-parser@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.5.13.tgz#29ce0baa97411f70e8cce68ce9c0f9d819a4e298"
-  integrity sha512-vrvvB18Kh4uyghSKb0NTv+2WZx871WL2NzwMj61jcq2bXkyhRC+8Q0oD7JGVf0+5i/fKQYQSBCNMMsDMRVAMqA==
+"@webassemblyjs/helper-wasm-bytecode@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.7.11.tgz#dd9a1e817f1c2eb105b4cf1013093cb9f3c9cb06"
+  integrity sha512-cMXeVS9rhoXsI9LLL4tJxBgVD/KMOKXuFqYb5oCJ/opScWpkCMEz9EJtkonaNcnLv2R3K5jIeS4TRj/drde1JQ==
 
-"@webassemblyjs/helper-api-error@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.5.13.tgz#e49b051d67ee19a56e29b9aa8bd949b5b4442a59"
-  integrity sha512-dBh2CWYqjaDlvMmRP/kudxpdh30uXjIbpkLj9HQe+qtYlwvYjPRjdQXrq1cTAAOUSMTtzqbXIxEdEZmyKfcwsg==
+"@webassemblyjs/helper-wasm-bytecode@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz#537a750eddf5c1e932f3744206551c91c1b93e61"
+  integrity sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==
 
-"@webassemblyjs/helper-buffer@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.5.13.tgz#873bb0a1b46449231137c1262ddfd05695195a1e"
-  integrity sha512-v7igWf1mHcpJNbn4m7e77XOAWXCDT76Xe7Is1VQFXc4K5jRcFrl9D0NrqM4XifQ0bXiuTSkTKMYqDxu5MhNljA==
+"@webassemblyjs/helper-wasm-section@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.7.11.tgz#9c9ac41ecf9fbcfffc96f6d2675e2de33811e68a"
+  integrity sha512-8ZRY5iZbZdtNFE5UFunB8mmBEAbSI3guwbrsCl4fWdfRiAcvqQpeqd5KHhSWLL5wuxo53zcaGZDBU64qgn4I4Q==
   dependencies:
-    debug "^3.1.0"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
 
-"@webassemblyjs/helper-code-frame@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.5.13.tgz#1bd2181b6a0be14e004f0fe9f5a660d265362b58"
-  integrity sha512-yN6ScQQDFCiAXnVctdVO/J5NQRbwyTbQzsGzEgXsAnrxhjp0xihh+nNHQTMrq5UhOqTb5LykpJAvEv9AT0jnAQ==
+"@webassemblyjs/helper-wasm-section@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz#74ca6a6bcbe19e50a3b6b462847e69503e6bfcbf"
+  integrity sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==
   dependencies:
-    "@webassemblyjs/wast-printer" "1.5.13"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
 
-"@webassemblyjs/helper-fsm@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-fsm/-/helper-fsm-1.5.13.tgz#cdf3d9d33005d543a5c5e5adaabf679ffa8db924"
-  integrity sha512-hSIKzbXjVMRvy3Jzhgu+vDd/aswJ+UMEnLRCkZDdknZO3Z9e6rp1DAs0tdLItjCFqkz9+0BeOPK/mk3eYvVzZg==
-
-"@webassemblyjs/helper-module-context@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-module-context/-/helper-module-context-1.5.13.tgz#dc29ddfb51ed657655286f94a5d72d8a489147c5"
-  integrity sha512-zxJXULGPLB7r+k+wIlvGlXpT4CYppRz8fLUM/xobGHc9Z3T6qlmJD9ySJ2jknuktuuiR9AjnNpKYDECyaiX+QQ==
+"@webassemblyjs/ieee754@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.7.11.tgz#c95839eb63757a31880aaec7b6512d4191ac640b"
+  integrity sha512-Mmqx/cS68K1tSrvRLtaV/Lp3NZWzXtOHUW2IvDvl2sihAwJh4ACE0eL6A8FvMyDG9abes3saB6dMimLOs+HMoQ==
   dependencies:
-    debug "^3.1.0"
-    mamacro "^0.0.3"
+    "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/helper-wasm-bytecode@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.5.13.tgz#03245817f0a762382e61733146f5773def15a747"
-  integrity sha512-0n3SoNGLvbJIZPhtMFq0XmmnA/YmQBXaZKQZcW8maGKwLpVcgjNrxpFZHEOLKjXJYVN5Il8vSfG7nRX50Zn+aw==
-
-"@webassemblyjs/helper-wasm-section@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.5.13.tgz#efc76f44a10d3073b584b43c38a179df173d5c7d"
-  integrity sha512-IJ/goicOZ5TT1axZFSnlAtz4m8KEjYr12BNOANAwGFPKXM4byEDaMNXYowHMG0yKV9a397eU/NlibFaLwr1fbw==
+"@webassemblyjs/ieee754@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz#712329dbef240f36bf57bd2f7b8fb9bf4154421e"
+  integrity sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==
   dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-buffer" "1.5.13"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
-    "@webassemblyjs/wasm-gen" "1.5.13"
-    debug "^3.1.0"
+    "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/ieee754@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.5.13.tgz#573e97c8c12e4eebb316ca5fde0203ddd90b0364"
-  integrity sha512-TseswvXEPpG5TCBKoLx9tT7+/GMACjC1ruo09j46ULRZWYm8XHpDWaosOjTnI7kr4SRJFzA6MWoUkAB+YCGKKg==
+"@webassemblyjs/leb128@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.7.11.tgz#d7267a1ee9c4594fd3f7e37298818ec65687db63"
+  integrity sha512-vuGmgZjjp3zjcerQg+JA+tGOncOnJLWVkt8Aze5eWQLwTQGNgVLcyOTqgSCxWTR4J42ijHbBxnuRaL1Rv7XMdw==
   dependencies:
-    ieee754 "^1.1.11"
+    "@xtuc/long" "4.2.1"
 
-"@webassemblyjs/leb128@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.5.13.tgz#ab52ebab9cec283c1c1897ac1da833a04a3f4cee"
-  integrity sha512-0NRMxrL+GG3eISGZBmLBLAVjphbN8Si15s7jzThaw1UE9e5BY1oH49/+MA1xBzxpf1OW5sf9OrPDOclk9wj2yg==
+"@webassemblyjs/leb128@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.8.5.tgz#044edeb34ea679f3e04cd4fd9824d5e35767ae10"
+  integrity sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==
   dependencies:
-    long "4.0.0"
+    "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.5.13.tgz#6b53d2cd861cf94fa99c1f12779dde692fbc2469"
-  integrity sha512-Ve1ilU2N48Ew0lVGB8FqY7V7hXjaC4+PeZM+vDYxEd+R2iQ0q+Wb3Rw8v0Ri0+rxhoz6gVGsnQNb4FjRiEH/Ng==
+"@webassemblyjs/utf8@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.7.11.tgz#06d7218ea9fdc94a6793aa92208160db3d26ee82"
+  integrity sha512-C6GFkc7aErQIAH+BMrIdVSmW+6HSe20wg57HEC1uqJP8E/xpMjXqQUxkQw07MhNDSDcGpxI9G5JSNOQCqJk4sA==
 
-"@webassemblyjs/wasm-edit@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.5.13.tgz#c9cef5664c245cf11b3b3a73110c9155831724a8"
-  integrity sha512-X7ZNW4+Hga4f2NmqENnHke2V/mGYK/xnybJSIXImt1ulxbCOEs/A+ZK/Km2jgihjyVxp/0z0hwIcxC6PrkWtgw==
+"@webassemblyjs/utf8@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.8.5.tgz#a8bf3b5d8ffe986c7c1e373ccbdc2a0915f0cedc"
+  integrity sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==
+
+"@webassemblyjs/wasm-edit@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.7.11.tgz#8c74ca474d4f951d01dbae9bd70814ee22a82005"
+  integrity sha512-FUd97guNGsCZQgeTPKdgxJhBXkUbMTY6hFPf2Y4OedXd48H97J+sOY2Ltaq6WGVpIH8o/TGOVNiVz/SbpEMJGg==
   dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-buffer" "1.5.13"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
-    "@webassemblyjs/helper-wasm-section" "1.5.13"
-    "@webassemblyjs/wasm-gen" "1.5.13"
-    "@webassemblyjs/wasm-opt" "1.5.13"
-    "@webassemblyjs/wasm-parser" "1.5.13"
-    "@webassemblyjs/wast-printer" "1.5.13"
-    debug "^3.1.0"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/helper-wasm-section" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-opt" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    "@webassemblyjs/wast-printer" "1.7.11"
 
-"@webassemblyjs/wasm-gen@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.5.13.tgz#8e6ea113c4b432fa66540189e79b16d7a140700e"
-  integrity sha512-yfv94Se8R73zmr8GAYzezFHc3lDwE/lBXQddSiIZEKZFuqy7yWtm3KMwA1uGbv5G1WphimJxboXHR80IgX1hQA==
+"@webassemblyjs/wasm-edit@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz#962da12aa5acc1c131c81c4232991c82ce56e01a"
+  integrity sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==
   dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
-    "@webassemblyjs/ieee754" "1.5.13"
-    "@webassemblyjs/leb128" "1.5.13"
-    "@webassemblyjs/utf8" "1.5.13"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/helper-wasm-section" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-opt" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    "@webassemblyjs/wast-printer" "1.8.5"
 
-"@webassemblyjs/wasm-opt@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.5.13.tgz#147aad7717a7ee4211c36b21a5f4c30dddf33138"
-  integrity sha512-IkXSkgzVhQ0QYAdIayuCWMmXSYx0dHGU8Ah/AxJf1gBvstMWVnzJnBwLsXLyD87VSBIcsqkmZ28dVb0mOC3oBg==
+"@webassemblyjs/wasm-gen@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.7.11.tgz#9bbba942f22375686a6fb759afcd7ac9c45da1a8"
+  integrity sha512-U/KDYp7fgAZX5KPfq4NOupK/BmhDc5Kjy2GIqstMhvvdJRcER/kUsMThpWeRP8BMn4LXaKhSTggIJPOeYHwISA==
   dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-buffer" "1.5.13"
-    "@webassemblyjs/wasm-gen" "1.5.13"
-    "@webassemblyjs/wasm-parser" "1.5.13"
-    debug "^3.1.0"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
 
-"@webassemblyjs/wasm-parser@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.5.13.tgz#6f46516c5bb23904fbdf58009233c2dd8a54c72f"
-  integrity sha512-XnYoIcu2iqq8/LrtmdnN3T+bRjqYFjRHqWbqK3osD/0r/Fcv4d9ecRzjVtC29ENEuNTK4mQ9yyxCBCbK8S/cpg==
+"@webassemblyjs/wasm-gen@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz#54840766c2c1002eb64ed1abe720aded714f98bc"
+  integrity sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==
   dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-api-error" "1.5.13"
-    "@webassemblyjs/helper-wasm-bytecode" "1.5.13"
-    "@webassemblyjs/ieee754" "1.5.13"
-    "@webassemblyjs/leb128" "1.5.13"
-    "@webassemblyjs/utf8" "1.5.13"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
 
-"@webassemblyjs/wast-parser@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.5.13.tgz#5727a705d397ae6a3ae99d7f5460acf2ec646eea"
-  integrity sha512-Lbz65T0LQ1LgzKiUytl34CwuhMNhaCLgrh0JW4rJBN6INnBB8NMwUfQM+FxTnLY9qJ+lHJL/gCM5xYhB9oWi4A==
+"@webassemblyjs/wasm-opt@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.7.11.tgz#b331e8e7cef8f8e2f007d42c3a36a0580a7d6ca7"
+  integrity sha512-XynkOwQyiRidh0GLua7SkeHvAPXQV/RxsUeERILmAInZegApOUAIJfRuPYe2F7RcjOC9tW3Cb9juPvAC/sCqvg==
   dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/floating-point-hex-parser" "1.5.13"
-    "@webassemblyjs/helper-api-error" "1.5.13"
-    "@webassemblyjs/helper-code-frame" "1.5.13"
-    "@webassemblyjs/helper-fsm" "1.5.13"
-    long "^3.2.0"
-    mamacro "^0.0.3"
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-buffer" "1.7.11"
+    "@webassemblyjs/wasm-gen" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
 
-"@webassemblyjs/wast-printer@1.5.13":
-  version "1.5.13"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.5.13.tgz#bb34d528c14b4f579e7ec11e793ec50ad7cd7c95"
-  integrity sha512-QcwogrdqcBh8Z+eUF8SG+ag5iwQSXxQJELBEHmLkk790wgQgnIMmntT2sMAMw53GiFNckArf5X0bsCA44j3lWQ==
+"@webassemblyjs/wasm-opt@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz#b24d9f6ba50394af1349f510afa8ffcb8a63d264"
+  integrity sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==
   dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/wast-parser" "1.5.13"
-    long "^3.2.0"
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-buffer" "1.8.5"
+    "@webassemblyjs/wasm-gen" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+
+"@webassemblyjs/wasm-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.7.11.tgz#6e3d20fa6a3519f6b084ef9391ad58211efb0a1a"
+  integrity sha512-6lmXRTrrZjYD8Ng8xRyvyXQJYUQKYSXhJqXOBLw24rdiXsHAOlvw5PhesjdcaMadU/pyPQOJ5dHreMjBxwnQKg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-wasm-bytecode" "1.7.11"
+    "@webassemblyjs/ieee754" "1.7.11"
+    "@webassemblyjs/leb128" "1.7.11"
+    "@webassemblyjs/utf8" "1.7.11"
+
+"@webassemblyjs/wasm-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz#21576f0ec88b91427357b8536383668ef7c66b8d"
+  integrity sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-wasm-bytecode" "1.8.5"
+    "@webassemblyjs/ieee754" "1.8.5"
+    "@webassemblyjs/leb128" "1.8.5"
+    "@webassemblyjs/utf8" "1.8.5"
+
+"@webassemblyjs/wast-parser@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.7.11.tgz#25bd117562ca8c002720ff8116ef9072d9ca869c"
+  integrity sha512-lEyVCg2np15tS+dm7+JJTNhNWq9yTZvi3qEhAIIOaofcYlUp0UR5/tVqOwa/gXYr3gjwSZqw+/lS9dscyLelbQ==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/floating-point-hex-parser" "1.7.11"
+    "@webassemblyjs/helper-api-error" "1.7.11"
+    "@webassemblyjs/helper-code-frame" "1.7.11"
+    "@webassemblyjs/helper-fsm" "1.7.11"
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/wast-parser@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz#e10eecd542d0e7bd394f6827c49f3df6d4eefb8c"
+  integrity sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/floating-point-hex-parser" "1.8.5"
+    "@webassemblyjs/helper-api-error" "1.8.5"
+    "@webassemblyjs/helper-code-frame" "1.8.5"
+    "@webassemblyjs/helper-fsm" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@webassemblyjs/wast-printer@1.7.11":
+  version "1.7.11"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.7.11.tgz#c4245b6de242cb50a2cc950174fdbf65c78d7813"
+  integrity sha512-m5vkAsuJ32QpkdkDOUPGSltrg8Cuk3KBx4YrmAGQwCZPRdUHXxG4phIOuuycLemHFr74sWL9Wthqss4fzdzSwg==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/wast-parser" "1.7.11"
+    "@xtuc/long" "4.2.1"
+
+"@webassemblyjs/wast-printer@1.8.5":
+  version "1.8.5"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz#114bbc481fd10ca0e23b3560fa812748b0bae5bc"
+  integrity sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/wast-parser" "1.8.5"
+    "@xtuc/long" "4.2.2"
+
+"@xtuc/ieee754@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@xtuc/ieee754/-/ieee754-1.2.0.tgz#eef014a3145ae477a1cbc00cd1e552336dceb790"
+  integrity sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==
+
+"@xtuc/long@4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.1.tgz#5c85d662f76fa1d34575766c5dcd6615abcd30d8"
+  integrity sha512-FZdkNBDqBRHKQ2MEbSC17xnPFOhZxeJ2YGSfr2BKf3sujG49Qe3bB+rGCwQfIaA7WHnGeGkSijX4FuBCdrzW/g==
+
+"@xtuc/long@4.2.2":
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/@xtuc/long/-/long-4.2.2.tgz#d291c6a4e97989b5c61d9acf396ae4fe133a718d"
+  integrity sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==
+
+"@yarnpkg/lockfile@1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@yarnpkg/lockfile/-/lockfile-1.1.0.tgz#e77a97fbd345b76d83245edcd17d393b1b41fb31"
+  integrity sha512-GpSwvyXOcOOlV70vbnzjj4fW5xW/FdUF6nQEt1ENy7m4ZCczi1+/buVUPAqmGfqznsORNFzUMjctTIp8a9tuCQ==
+
+JSONStream@^1.3.4:
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/JSONStream/-/JSONStream-1.3.5.tgz#3208c1f08d3a4d99261ab64f92302bc15e111ca0"
+  integrity sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==
+  dependencies:
+    jsonparse "^1.2.0"
+    through ">=2.2.7 <3"
 
 abbrev@1:
   version "1.1.1"
@@ -677,40 +1044,40 @@ accepts@~1.3.7:
     mime-types "~2.1.24"
     negotiator "0.6.2"
 
-acorn-dynamic-import@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-3.0.0.tgz#901ceee4c7faaef7e07ad2a47e890675da50a278"
-  integrity sha512-zVWV8Z8lislJoOKKqdNMOB+s6+XV5WERty8MnKBeFgwA+19XJjJHs2RP5dzM57FftIs+jQnRToLiWazKr6sSWg==
-  dependencies:
-    acorn "^5.0.0"
+acorn-dynamic-import@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/acorn-dynamic-import/-/acorn-dynamic-import-4.0.0.tgz#482210140582a36b83c3e342e1cfebcaa9240948"
+  integrity sha512-d3OEjQV4ROpoflsnUA8HozoIR504TFxNivYEUi6uwz0IYhBkTDXGuWlNdMtybRt3nqVx/L6XqMt0FxkXuWKZhw==
+
+acorn-jsx@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.1.0.tgz#294adb71b57398b0680015f0a38c563ee1db5384"
+  integrity sha512-tMUqwBWfLFbJbizRmEcWSLw6HnFzfdJs2sOJEOwwtVPMoH/0Ay+E703oZz78VSXZiiDcZrQ5XKjPIUQixhmgVw==
 
 acorn-walk@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.1.1.tgz#d363b66f5fac5f018ff9c3a1e7b6f8e310cc3913"
   integrity sha512-OtUw6JUTgxA2QoqqmrmQ7F2NYqiBPi/L2jqHyFtllhOUvXYQXf0Z1CYUinIfyT4bTCGmrA7gX9FvHA81uzCoVw==
 
-acorn@^5.0.0, acorn@^5.5.0, acorn@^5.6.2:
+acorn@^5.5.0:
   version "5.7.2"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-5.7.2.tgz#91fa871883485d06708800318404e72bfb26dcc5"
   integrity sha512-cJrKCNcr2kv8dlDnbw+JPUGjHZzo4myaxOLmpOX8a+rgX94YeTcTMv/LFJUSByRpc+i4GgVnnhLxvMu/2Y+rqw==
 
+acorn@^6.0.5, acorn@^6.2.1:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.0.tgz#b659d2ffbafa24baf5db1cdbb2c94a983ecd2784"
+  integrity sha512-gac8OEcQ2Li1dxIEWGZzsp2BitJxwkwcOm0zHAJLcPJaVvm58FRnk6RkuLRpU1EujipU2ZFODv2P9DLMfnV8mw==
+
 acorn@^6.0.7:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.1.1.tgz#7d25ae05bb8ad1f9b699108e1094ecd7884adc1f"
   integrity sha512-jPTiwtOxaHNaAPg/dmrJ/beuzLRnXtB0kQPQ8JpotKJgTB6rX6c8mlf315941pyjBSaPg8NHXS9fhP4u17DpGA==
 
-adjust-sourcemap-loader@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/adjust-sourcemap-loader/-/adjust-sourcemap-loader-1.2.0.tgz#e33fde95e50db9f2a802e3647e311d2fc5000c69"
-  integrity sha512-958oaHHVEXMvsY7v7cC5gEkNIcoaAVIhZ4mBReYVZJOTP9IgKmzLjIOhTtzpLMu+qriXvLsVjJ155EeInp45IQ==
-  dependencies:
-    assert "^1.3.0"
-    camelcase "^1.2.1"
-    loader-utils "^1.1.0"
-    lodash.assign "^4.0.1"
-    lodash.defaults "^3.1.2"
-    object-path "^0.9.2"
-    regex-parser "^2.2.9"
+acorn@^7.1.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.1.0.tgz#949d36f2c292535da602283586c2477c57eb2d6c"
+  integrity sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ==
 
 adm-zip@^0.4.9:
   version "0.4.11"
@@ -722,23 +1089,60 @@ after@0.8.2:
   resolved "https://registry.yarnpkg.com/after/-/after-0.8.2.tgz#fedb394f9f0e02aa9768e702bda23b505fae7e1f"
   integrity sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=
 
-agent-base@^4.1.0:
+agent-base@4:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee"
+  integrity sha512-salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==
+  dependencies:
+    es6-promisify "^5.0.0"
+
+agent-base@^4.1.0, agent-base@~4.2.1:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.2.1.tgz#d89e5999f797875674c07d87f260fc41e83e8ca9"
   integrity sha512-JVwXMr9nHYTUXsBFKUqhJwvlcYU/blreOEUkhNR2eXZIvwd+c+o5V4MgDPKWnMS/56awN3TRzIP+KoPn+roQtg==
   dependencies:
     es6-promisify "^5.0.0"
 
+agentkeepalive@^3.4.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/agentkeepalive/-/agentkeepalive-3.5.2.tgz#a113924dd3fa24a0bc3b78108c450c2abee00f67"
+  integrity sha512-e0L/HNe6qkQ7H19kTlRRqUibEAwDK5AFk6y3PtMsuut2VAH6+Q4xZml1tNDJD7kSAyqmbG/K08K5WEJYtUrSlQ==
+  dependencies:
+    humanize-ms "^1.2.1"
+
+aggregate-error@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz#db2fe7246e536f40d9b5442a39e117d7dd6a24e0"
+  integrity sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==
+  dependencies:
+    clean-stack "^2.0.0"
+    indent-string "^4.0.0"
+
 ajv-errors@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.0.tgz#ecf021fa108fd17dfb5e6b383f2dd233e31ffc59"
-  integrity sha1-7PAh+hCP0X37Xms4Py3SM+Mf/Fk=
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
+  integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
 ajv-keywords@^3.1.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.2.0.tgz#e86b819c602cf8821ad637413698f1dec021847a"
   integrity sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=
 
+ajv-keywords@^3.4.1:
+  version "3.4.1"
+  resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz#ef916e271c64ac12171fd8384eaae6b2345854da"
+  integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ==
+
+ajv@6.9.1:
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.9.1.tgz#a4d3683d74abc5670e75f0b16520f70a20ea8dc1"
+  integrity sha512-XDN92U311aINL77ieWHmqCcNlwjoP5cHXDxIxbf2MaPYuCXOHS7gHH8jktxeK5omgd52XbSTX6a4Piwd1pQmzA==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
 ajv@^5.0.0, ajv@^5.3.0:
   version "5.5.2"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-5.5.2.tgz#73b5eeca3fab653e3d3f9422b341ad42205dc965"
@@ -749,7 +1153,17 @@ ajv@^5.0.0, ajv@^5.3.0:
     fast-json-stable-stringify "^2.0.0"
     json-schema-traverse "^0.3.0"
 
-ajv@^6.1.0, ajv@^6.1.1:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2:
+  version "6.10.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.10.2.tgz#d3cea04d6b017b2894ad69040fec8b623eb4bd52"
+  integrity sha512-TXtUUEYHuaTEbLZWIKUr5pmBuhDLy+8KYtPYdcV8qC+pOZL+NKqYwvWSRrVXHn+ZmRRAu8vJTAznH7Oag6RVRw==
+  dependencies:
+    fast-deep-equal "^2.0.1"
+    fast-json-stable-stringify "^2.0.0"
+    json-schema-traverse "^0.4.1"
+    uri-js "^4.2.2"
+
+ajv@^6.1.1:
   version "6.5.3"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.5.3.tgz#71a569d189ecf4f4f321224fecb166f071dd90f9"
   integrity sha512-LqZ9wY+fx3UMiiPd741yB2pj3hhil+hQc8taf4o2QGRFpWgZ2V5C8HA165DY9sS3fJwsk7uT7ZlFEyC3Ig3lLg==
@@ -803,10 +1217,10 @@ angular2-text-mask@9.0.0:
   dependencies:
     text-mask-core "^5.0.0"
 
-angulartics2@^6.2.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-6.3.0.tgz#85107238fe021e1e1e5cb492c5979aed829a1240"
-  integrity sha512-5BwRYCLF6ypBl7rlarW403v4AdotIldJhN+2rQeTIw/rTtngJ4SewNhf4zlRnKBSItlhbZRrDJBl9uR2TUuCdw==
+angulartics2@7.5.2:
+  version "7.5.2"
+  resolved "https://registry.yarnpkg.com/angulartics2/-/angulartics2-7.5.2.tgz#58ea8eca811581350f5067ddedecd9f070d82598"
+  integrity sha512-gfQ/kRtrKD0fLOGZsWlcD8obIWTAJGSdiVRp6lH+LxLD8shKnl1/StWlUJeOioUkU0ps4QGRb0tCSlCdnI5DAw==
   dependencies:
     tslib "^1.9.0"
 
@@ -846,6 +1260,13 @@ ansi-escapes@^3.0.0:
   resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.1.0.tgz#f73207bb81207d75fd6c83f125af26eea378ca30"
   integrity sha512-UgAb8H9D41AQnu/PbWlCofQVcnV4Gs2bBJi9eZPxfU/hgglFh3SMDMENRIqdr7H6XFnXdoknctFByVsCOotTVw==
 
+ansi-escapes@^4.2.1:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.0.tgz#a4ce2b33d6b214b7950d8595c212f12ac9cc569d"
+  integrity sha512-EiYhwo0v255HUL6eDyuLrXEkTi7WwVCLAw+SeOQ7M7qdun1z1pum4DEm/nuqIVbPvi9RPPc9k9LbyBv6H0DwVg==
+  dependencies:
+    type-fest "^0.8.1"
+
 ansi-gray@^0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/ansi-gray/-/ansi-gray-0.1.1.tgz#2962cf54ec9792c48510a3deb524436861ef7251"
@@ -880,6 +1301,11 @@ ansi-regex@^4.1.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
   integrity sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==
 
+ansi-regex@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
+  integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -902,14 +1328,6 @@ any-promise@^0.1.0:
   resolved "https://registry.yarnpkg.com/any-promise/-/any-promise-0.1.0.tgz#830b680aa7e56f33451d4b049f3bd8044498ee27"
   integrity sha1-gwtoCqflbzNFHUsEnzvYBESY7ic=
 
-anymatch@^1.3.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-1.3.2.tgz#553dcb8f91e3c889845dfdba34c77721b90b9d7a"
-  integrity sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==
-  dependencies:
-    micromatch "^2.1.5"
-    normalize-path "^2.0.0"
-
 anymatch@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-2.0.0.tgz#bcb24b4f37934d9aa7ac17b4adaf89e7c76ef2eb"
@@ -918,10 +1336,10 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-app-root-path@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.1.0.tgz#98bf6599327ecea199309866e8140368fd2e646a"
-  integrity sha1-mL9lmTJ+zqGZMJhm6BQDaP0uZGo=
+app-root-path@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-2.2.1.tgz#d0df4a682ee408273583d43f6f79e9892624bc9a"
+  integrity sha512-91IFKeKk7FjfmezPKkwtaRvSpnUc4gDwPAjA1YZ9Gn0q0PPeW+vbeUsZuyDwjI7+QTHhcLen2v25fi/AmhvbJA==
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
@@ -972,6 +1390,14 @@ argparse@^1.0.7:
   dependencies:
     sprintf-js "~1.0.2"
 
+aria-query@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aria-query/-/aria-query-3.0.0.tgz#65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"
+  integrity sha1-ZbP8wcoRVajJrmTW7uKX8V1RM8w=
+  dependencies:
+    ast-types-flow "0.0.7"
+    commander "^2.11.0"
+
 arr-diff@^1.0.1:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/arr-diff/-/arr-diff-1.1.0.tgz#687c32758163588fef7de7b36fabe495eb1a399a"
@@ -1079,6 +1505,11 @@ arrify@^1.0.0, arrify@^1.0.1:
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
   integrity sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=
 
+asap@~2.0.3:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/asap/-/asap-2.0.6.tgz#e50347611d7e690943208bbdafebcbc2fb866d46"
+  integrity sha1-5QNHYR1+aQlDIIu9r+vLwvuGbUY=
+
 asn1.js@^4.0.0:
   version "4.10.1"
   resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz#b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"
@@ -1100,7 +1531,7 @@ assert-plus@1.0.0, assert-plus@^1.0.0:
   resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"
   integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=
 
-assert@^1.1.1, assert@^1.3.0:
+assert@^1.1.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/assert/-/assert-1.4.1.tgz#99912d591836b5a6f5b345c0f07eefc08fc65d91"
   integrity sha1-mZEtWRg2tab1s0XA8H7vwI/GXZE=
@@ -1112,6 +1543,16 @@ assign-symbols@^1.0.0:
   resolved "https://registry.yarnpkg.com/assign-symbols/-/assign-symbols-1.0.0.tgz#59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"
   integrity sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=
 
+ast-types-flow@0.0.7:
+  version "0.0.7"
+  resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
+  integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
+
+astral-regex@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-1.0.0.tgz#6c8c3fb827dd43ee3918f27b82782ab7658a6fd9"
+  integrity sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==
+
 async-each@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.1.tgz#19d386a1d9edc6e7c1c85d388aedbcc56d33602d"
@@ -1137,7 +1578,7 @@ async@1.x, async@^1.5.2:
   resolved "https://registry.yarnpkg.com/async/-/async-1.5.2.tgz#ec6a61ae56480c0c3cb241c95618e20892f9672a"
   integrity sha1-7GphrlZIDAw8skHJVhjiCJL5Zyo=
 
-async@^2.0.0, async@^2.5.0:
+async@^2.0.0:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.1.tgz#b245a23ca71930044ec53fa46aa00a3e87c6a610"
   integrity sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==
@@ -1147,10 +1588,11 @@ async@^2.0.0, async@^2.5.0:
 async@^2.1.4:
   version "2.6.2"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.2.tgz#18330ea7e6e313887f5d2f2a904bac6fe4dd5381"
+  integrity sha512-H1qVYh1MYhEEFLsP97cVKqCGo7KfCyTt6uEWqsTBr9SO84oK9Uwbyd/yCW+6rKJLHksBNUVWZDAjfS+Ccx0Bbg==
   dependencies:
     lodash "^4.17.11"
 
-async@^2.6.3:
+async@^2.5.0, async@^2.6.2, async@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -1167,6 +1609,18 @@ atob@^2.1.1:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
+autoprefixer@9.4.6:
+  version "9.4.6"
+  resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.4.6.tgz#0ace275e33b37de16b09a5547dbfe73a98c1d446"
+  integrity sha512-Yp51mevbOEdxDUy5WjiKtpQaecqYq9OqZSL04rSoCiry7Tc5I9FEyo3bfxiTJc1DfHeKwSFCUYbBAiOQ2VGfiw==
+  dependencies:
+    browserslist "^4.4.1"
+    caniuse-lite "^1.0.30000929"
+    normalize-range "^0.1.2"
+    num2fraction "^1.2.2"
+    postcss "^7.0.13"
+    postcss-value-parser "^3.3.1"
+
 autoprefixer@^7.1.1:
   version "7.2.6"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-7.2.6.tgz#256672f86f7c735da849c4f07d008abb056067dc"
@@ -1201,6 +1655,14 @@ aws4@^1.8.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.8.0.tgz#f0e003d9ca9e7f59c7a508945d7b2ef9a04a542f"
   integrity sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ==
 
+axobject-query@^2.0.2:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.1.tgz#2a3b1271ec722d48a4cd4b3fcc20c853326a49a7"
+  integrity sha512-lF98xa/yvy6j3fBHAgQXIYl+J4eZadOSqsPojemUqClzNbBV38wWGpUbQbVEyf4eUF5yF7eHmGgGA2JiHyjeqw==
+  dependencies:
+    "@babel/runtime" "^7.7.4"
+    "@babel/runtime-corejs3" "^7.7.4"
+
 babel-code-frame@^6.22.0, babel-code-frame@^6.26.0:
   version "6.26.0"
   resolved "https://registry.yarnpkg.com/babel-code-frame/-/babel-code-frame-6.26.0.tgz#63fd43f7dc1e3bb7ce35947db8fe369a3f58c74b"
@@ -1386,6 +1848,7 @@ big.js@^3.1.3:
 big.js@^5.2.2:
   version "5.2.2"
   resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
+  integrity sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==
 
 binary-extensions@^1.0.0:
   version "1.11.0"
@@ -1423,6 +1886,11 @@ bluebird@^3.3.0, bluebird@^3.5.1:
   resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.1.tgz#d9551f9de98f1fcda1e683d17ee91a0602ee2eb9"
   integrity sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==
 
+bluebird@^3.5.3, bluebird@^3.5.5:
+  version "3.7.2"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
+  integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
+
 bn.js@^4.0.0, bn.js@^4.1.0, bn.js@^4.1.1, bn.js@^4.4.0:
   version "4.11.8"
   resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz#2cde09eb5ee341f484746bb0309b3253b1b1442f"
@@ -1519,13 +1987,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-braces@^0.1.2:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/braces/-/braces-0.1.5.tgz#c085711085291d8b75fdd74eab0f8597280711e6"
-  integrity sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=
-  dependencies:
-    expand-range "^0.1.0"
-
 braces@^1.8.2:
   version "1.8.5"
   resolved "https://registry.yarnpkg.com/braces/-/braces-1.8.5.tgz#ba77962e12dff969d6b76711e914b737857bf6a7"
@@ -1646,6 +2107,15 @@ browserslist@^4.0.2:
     electron-to-chromium "^1.3.61"
     node-releases "^1.0.0-alpha.11"
 
+browserslist@^4.4.1:
+  version "4.8.2"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.8.2.tgz#b45720ad5fbc8713b7253c20766f701c9a694289"
+  integrity sha512-+M4oeaTplPm/f1pXDw84YohEv7B1i/2Aisei8s4s6k3QsoSHa7i5sz8u/cGQkkatCPxMASKxPualR4wwYgVboA==
+  dependencies:
+    caniuse-lite "^1.0.30001015"
+    electron-to-chromium "^1.3.322"
+    node-releases "^1.1.42"
+
 browserstack@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/browserstack/-/browserstack-1.5.1.tgz#e2dfa66ffee940ebad0a07f7e00fd4687c455d66"
@@ -1743,7 +2213,7 @@ bytes@3.1.0:
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.1.0.tgz#f6cf7933a360e0588fa9fde85651cdc7f805d1f6"
   integrity sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==
 
-cacache@^10.0.1, cacache@^10.0.4:
+cacache@^10.0.4:
   version "10.0.4"
   resolved "https://registry.yarnpkg.com/cacache/-/cacache-10.0.4.tgz#6452367999eff9d4188aefd9a14e9d7c6a263460"
   integrity sha512-Dph0MzuH+rTQzGPNT9fAnrPmMmjKfST6trxJeK7NQuHRaVw24VzPRWTmg9MpcwOVQZO0E1FBICUlFeNaKPIfHA==
@@ -1762,6 +2232,71 @@ cacache@^10.0.1, cacache@^10.0.4:
     unique-filename "^1.1.0"
     y18n "^4.0.0"
 
+cacache@^11.0.2, cacache@^11.3.2, cacache@^11.3.3:
+  version "11.3.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-11.3.3.tgz#8bd29df8c6a718a6ebd2d010da4d7972ae3bbadc"
+  integrity sha512-p8WcneCytvzPxhDvYp31PD039vi77I12W+/KfR9S8AZbaiARFBCpsPJS+9uhWfeBfeAtW7o/4vt3MUqLkbY6nA==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cacache@^12.0.2, cacache@^12.0.3:
+  version "12.0.3"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz#be99abba4e1bf5df461cd5a2c1071fc432573390"
+  integrity sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==
+  dependencies:
+    bluebird "^3.5.5"
+    chownr "^1.1.1"
+    figgy-pudding "^3.5.1"
+    glob "^7.1.4"
+    graceful-fs "^4.1.15"
+    infer-owner "^1.0.3"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    promise-inflight "^1.0.1"
+    rimraf "^2.6.3"
+    ssri "^6.0.1"
+    unique-filename "^1.1.1"
+    y18n "^4.0.0"
+
+cacache@^13.0.1:
+  version "13.0.1"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-13.0.1.tgz#a8000c21697089082f85287a1aec6e382024a71c"
+  integrity sha512-5ZvAxd05HDDU+y9BVvcqYu2LLXmPnQ0hW62h32g4xBTgL/MppR4/04NHfj/ycM2y6lmTnbw6HVi+1eN0Psba6w==
+  dependencies:
+    chownr "^1.1.2"
+    figgy-pudding "^3.5.1"
+    fs-minipass "^2.0.0"
+    glob "^7.1.4"
+    graceful-fs "^4.2.2"
+    infer-owner "^1.0.4"
+    lru-cache "^5.1.1"
+    minipass "^3.0.0"
+    minipass-collect "^1.0.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.2"
+    mkdirp "^0.5.1"
+    move-concurrently "^1.0.1"
+    p-map "^3.0.0"
+    promise-inflight "^1.0.1"
+    rimraf "^2.7.1"
+    ssri "^7.0.0"
+    unique-filename "^1.1.1"
+
 cache-base@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/cache-base/-/cache-base-1.0.1.tgz#0a7f46416831c8b662ee36fe4e7c59d76f666ab2"
@@ -1806,6 +2341,11 @@ callsites@^2.0.0:
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50"
   integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA=
 
+callsites@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
+  integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
+
 camel-case@3.0.x:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"
@@ -1822,11 +2362,6 @@ camelcase-keys@^2.0.0:
     camelcase "^2.0.0"
     map-obj "^1.0.0"
 
-camelcase@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-1.2.1.tgz#9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"
-  integrity sha1-m7UwTS4LVmmLLHWLCKPqqdqlijk=
-
 camelcase@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-2.1.1.tgz#7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"
@@ -1842,7 +2377,7 @@ camelcase@^4.0.0, camelcase@^4.1.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-4.1.0.tgz#d545635be1e33c542649c69173e5de6acfae34dd"
   integrity sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=
 
-camelcase@^5.0.0:
+camelcase@^5.0.0, camelcase@^5.3.1:
   version "5.3.1"
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
@@ -1872,11 +2407,21 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000697, caniuse-lite@^1.0.30000792, can
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000883.tgz#597c1eabfb379bd9fbeaa778632762eb574706ac"
   integrity sha512-ovvb0uya4cKJct8Rj9Olstz0LaWmyJhCp3NawRG5fVigka8pEhIIwipF7zyYd2Q58UZb5YfIt52pVF444uj2kQ==
 
+caniuse-lite@^1.0.30000929, caniuse-lite@^1.0.30001015:
+  version "1.0.30001016"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001016.tgz#16ea48d7d6e8caf3cad3295c2d746fe38c4e7f66"
+  integrity sha512-yYQ2QfotceRiH4U+h1Us86WJXtVHDmy3nEKIdYPsZCYnOV5/tMgGbmoIlrMzmh2VXlproqYtVaKeGDBkMZifFA==
+
 caniuse-lite@^1.0.30000939:
   version "1.0.30000948"
   resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30000948.tgz#793ed7c28fe664856beb92b43fc013fc22b81633"
   integrity sha512-Lw4y7oz1X5MOMZm+2IFaSISqVVQvUuD+ZUSfeYK/SlYiMjkHN/eJ2PDfJehW5NA6JjrxYSSnIWfwjeObQMEjFQ==
 
+canonical-path@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/canonical-path/-/canonical-path-1.0.0.tgz#fcb470c23958def85081856be7a86e904f180d1d"
+  integrity sha512-feylzsbDxi1gPZ1IjystzIQZagYYLvfKrSuygUCgf7z6x790VEzze5QEkdSV1U58RA7Hi0+v6fv4K54atOzATg==
+
 capture-stack-trace@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/capture-stack-trace/-/capture-stack-trace-1.0.0.tgz#4a6fa07399c26bba47f0b2496b4d0fb408c5550d"
@@ -1896,7 +2441,7 @@ cerialize@0.1.18:
 
 chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
   version "1.1.3"
-  resolved "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
   integrity sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=
   dependencies:
     ansi-styles "^2.2.1"
@@ -1905,7 +2450,7 @@ chalk@1.1.3, chalk@^1.0.0, chalk@^1.1.1, chalk@^1.1.3:
     strip-ansi "^3.0.0"
     supports-color "^2.0.0"
 
-chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
+chalk@2.4.2, chalk@^2.0.0, chalk@^2.0.1, chalk@^2.1.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2:
   version "2.4.2"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424"
   integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==
@@ -1934,23 +2479,7 @@ check-types@^7.3.0:
   resolved "https://registry.yarnpkg.com/check-types/-/check-types-7.4.0.tgz#0378ec1b9616ec71f774931a3c6516fad8c152f4"
   integrity sha512-YbulWHdfP99UfZ73NcUDlNJhEIDgm9Doq9GhpyXbF+7Aegi3CVV7qqMCKTTqJxlvEvnQBp9IA+dxsGN6xK/nSg==
 
-chokidar@^1.4.2:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-1.7.0.tgz#798e689778151c8076b4b360e5edd28cda2bb468"
-  integrity sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=
-  dependencies:
-    anymatch "^1.3.0"
-    async-each "^1.0.0"
-    glob-parent "^2.0.0"
-    inherits "^2.0.1"
-    is-binary-path "^1.0.0"
-    is-glob "^2.0.0"
-    path-is-absolute "^1.0.0"
-    readdirp "^2.0.0"
-  optionalDependencies:
-    fsevents "^1.0.0"
-
-chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4:
+chokidar@2.0.4, chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.0.4.tgz#356ff4e2b0e8e43e322d18a372460bbcf3accd26"
   integrity sha512-z9n7yt9rOvIJrMhvDtDictKrkFHeihkNl6uWMmZlmL6tJtX9Cs+87oK+teBx+JIgzvbX3yZHT3eF8vpbDxHJXQ==
@@ -1970,6 +2499,25 @@ chokidar@^2.0.0, chokidar@^2.0.2, chokidar@^2.0.3, chokidar@^2.0.4:
   optionalDependencies:
     fsevents "^1.2.2"
 
+chokidar@^2.1.1:
+  version "2.1.8"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.8.tgz#804b3a7b6a99358c3c5c61e71d8728f041cff917"
+  integrity sha512-ZmZUazfOzf0Nve7duiCKD23PFSCs4JPoYyccjUFF3aQkQadqBhfzhjkwBH2mNOG9cTBwhamM37EIsIkZw3nRgg==
+  dependencies:
+    anymatch "^2.0.0"
+    async-each "^1.0.1"
+    braces "^2.3.2"
+    glob-parent "^3.1.0"
+    inherits "^2.0.3"
+    is-binary-path "^1.0.0"
+    is-glob "^4.0.0"
+    normalize-path "^3.0.0"
+    path-is-absolute "^1.0.0"
+    readdirp "^2.2.1"
+    upath "^1.1.1"
+  optionalDependencies:
+    fsevents "^1.2.7"
+
 chokidar@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-2.1.6.tgz#b6cad653a929e244ce8a834244164d241fa954c5"
@@ -1994,6 +2542,11 @@ chownr@^1.0.1:
   resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.0.1.tgz#e2a75042a9551908bebd25b8523d5f9769d79181"
   integrity sha1-4qdQQqlVGQi+vSW4Uj1fl2nXkYE=
 
+chownr@^1.1.1, chownr@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chownr/-/chownr-1.1.3.tgz#42d837d5239688d55f303003a508230fa6727142"
+  integrity sha512-i70fVHhmV3DtTl6nqvZOnIjbY0Pe4kAUjwHj8z0zAdgBtYrJyYwLKCCuRBQ5ppkyL0AkN7HKRnETdmdp1zqNXw==
+
 chrome-trace-event@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.0.tgz#45a91bd2c20c9411f0963b5aaeb9a1b95e09cc48"
@@ -2001,6 +2554,13 @@ chrome-trace-event@^1.0.0:
   dependencies:
     tslib "^1.9.0"
 
+chrome-trace-event@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
+  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
+  dependencies:
+    tslib "^1.9.0"
+
 ci-info@^1.3.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-1.4.0.tgz#4841d53cad49f11b827b648ebde27a6e189b412f"
@@ -2014,16 +2574,16 @@ cipher-base@^1.0.0, cipher-base@^1.0.1, cipher-base@^1.0.3:
     inherits "^2.0.1"
     safe-buffer "^5.0.1"
 
+circular-dependency-plugin@5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/circular-dependency-plugin/-/circular-dependency-plugin-5.0.2.tgz#da168c0b37e7b43563fb9f912c1c007c213389ef"
+  integrity sha512-oC7/DVAyfcY3UWKm0sN/oVoDedQDQiw/vIiAnuTWTpE5s0zWf7l3WY417Xw/Fbi/QbAjctAkxgMiS9P0s3zkmA==
+
 circular-json@^0.5.0:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.9.tgz#932763ae88f4f7dead7a0d09c8a51a4743a53b1d"
   integrity sha512-4ivwqHpIFJZBuhN3g/pEcdbnGUywkBblloGbkglyloVjjR3uT6tieI89MVOfbP2tHX5sgb01FuLgAOzebNlJNQ==
 
-circular-json@^0.5.5:
-  version "0.5.5"
-  resolved "https://registry.yarnpkg.com/circular-json/-/circular-json-0.5.5.tgz#64182ef359042d37cd8e767fc9de878b1e9447d3"
-  integrity sha512-13YaR6kiz0kBNmIVM87Io8Hp7bWOo4r61vkEANy8iH9R9bc6avud/1FT0SBpqR1RpIQADOh/Q+yHZDA1iL6ysA==
-
 class-utils@^0.3.5:
   version "0.3.6"
   resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463"
@@ -2034,13 +2594,18 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
-clean-css@4.2.x:
+clean-css@4.2.1, clean-css@4.2.x:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.1.tgz#2d411ef76b8569b6d0c84068dabe85b0aa5e5c17"
   integrity sha512-4ZxI6dy4lrY6FHzfiy1aEOXgu4LIsW2MhwG0VBKdcoGoH/XLFgaHSdLTGr4O8Be6A8r3MOphEiI8Gc1n0ecf3g==
   dependencies:
     source-map "~0.6.0"
 
+clean-stack@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/clean-stack/-/clean-stack-2.2.0.tgz#ee8472dbb129e727b31e8a10a427dee9dfe4008b"
+  integrity sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==
+
 cli-boxes@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/cli-boxes/-/cli-boxes-1.0.0.tgz#4fa917c3e59c94a004cd61f8ee509da651687143"
@@ -2053,6 +2618,13 @@ cli-cursor@^2.1.0:
   dependencies:
     restore-cursor "^2.0.0"
 
+cli-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-3.1.0.tgz#264305a7ae490d1d03bf0c9ba7c925d1753af307"
+  integrity sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==
+  dependencies:
+    restore-cursor "^3.1.0"
+
 cli-progress@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.3.1.tgz#e08fb6853e269c3bc7e0ad8ad0ede59035f5fbce"
@@ -2103,6 +2675,15 @@ clone-deep@^2.0.1:
     kind-of "^6.0.0"
     shallow-clone "^1.0.0"
 
+clone-deep@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/clone-deep/-/clone-deep-4.0.1.tgz#c19fd9bdbbf85942b4fd979c84dcf7d5f07c2387"
+  integrity sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==
+  dependencies:
+    is-plain-object "^2.0.4"
+    kind-of "^6.0.2"
+    shallow-clone "^3.0.0"
+
 clone-stats@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-0.0.1.tgz#b88f94a82cf38b8791d58046ea4029ad88ca99d1"
@@ -2113,6 +2694,11 @@ clone@^1.0.0, clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
+clone@^2.1.1, clone@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.2.tgz#1b7f4b9f591f1e8f83670401600345a02887435f"
+  integrity sha1-G39Ln1kfHo+DZwQBYANFoCiHQ18=
+
 co@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
@@ -2132,17 +2718,20 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codelyzer@^4.4.4:
-  version "4.4.4"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-4.4.4.tgz#29b7dbb51ba9ecc45c7300d61280a6564765d402"
-  integrity sha512-JgFMudx0n50IuE/ydAfnkksCwQkWSVWgYvhDPHZgDUbmsiYC22VuEXKu5l8Hhx9UJsLgjWDLjTAFGj2WaW5DUA==
+codelyzer@^5.1.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-5.2.0.tgz#b0ee573a12779c996090e596c5c1755479d83758"
+  integrity sha512-izfUfhEOOgAizszPlEDxo71DK/C4wprZw0vkY6UWcOSTQvN1JyfXf9DXwaV7WX+/JC+hH0ShXfdtGLA9Rca7LA==
   dependencies:
-    app-root-path "^2.1.0"
-    css-selector-tokenizer "^0.7.0"
+    app-root-path "^2.2.1"
+    aria-query "^3.0.0"
+    axobject-query "^2.0.2"
+    css-selector-tokenizer "^0.7.1"
     cssauron "^1.4.0"
+    damerau-levenshtein "^1.0.4"
     semver-dsl "^1.0.1"
     source-map "^0.5.7"
-    sprintf-js "^1.1.1"
+    sprintf-js "^1.1.2"
 
 collection-visit@^1.0.0:
   version "1.0.0"
@@ -2237,13 +2826,6 @@ colors@^1.1.2:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
-combine-lists@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/combine-lists/-/combine-lists-1.0.1.tgz#458c07e09e0d900fc28b70a3fec2dacd1d2cb7f6"
-  integrity sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=
-  dependencies:
-    lodash "^4.5.0"
-
 combined-stream@1.0.6, combined-stream@~1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.6.tgz#723e7df6e801ac5613113a7e445a9b69cb632818"
@@ -2261,7 +2843,12 @@ commander@2.17.x, commander@~2.17.1:
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.17.1.tgz#bd77ab7de6de94205ceacc72f1716d29f20a77bf"
   integrity sha512-wPMUt6FnH2yzG95SA6mzjQOEKUU3aLaDEmzs1ti+1E9h+CsrZghRlqEM/EJ4KscsQVG8uNN4uVreUeT8+drlgg==
 
-commander@^2.12.1, commander@^2.18.0, commander@~2.20.0:
+commander@^2.11.0, commander@^2.19.0, commander@^2.20.0, commander@~2.20.3:
+  version "2.20.3"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
+  integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
+
+commander@^2.12.1, commander@^2.18.0:
   version "2.20.0"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.0.tgz#d58bb2b5c1ee8f87b0d340027e9e94e222c5a422"
   integrity sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ==
@@ -2271,10 +2858,10 @@ commander@^3.0.2:
   resolved "https://registry.yarnpkg.com/commander/-/commander-3.0.2.tgz#6837c3fb677ad9933d1cfba42dd14d5117d6b39e"
   integrity sha512-Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow==
 
-commander@~2.13.0:
-  version "2.13.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-2.13.0.tgz#6964bca67685df7c1f1430c584f07d7597885b9c"
-  integrity sha512-MVuS359B+YzaWqjCL/c+22gfryv+mCBPHAv3zyVI2GN8EY6IRP8VwtasXn8jyyhvvq84R4ImN1OKRtcbIasjYA==
+commander@~2.19.0:
+  version "2.19.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-2.19.0.tgz#f6198aa84e5b83c46054b94ddedbfed5ee9ff12a"
+  integrity sha512-6tvAOO+D6OENvRAh524Dh9jcfKTYDQAqvqezbCW82xj5X0pSrcpxtvRKHLG0yBY6SD7PSDrJaj+0AiOcKVd1Xg==
 
 commondir@^1.0.1:
   version "1.0.1"
@@ -2320,15 +2907,16 @@ compressible@~2.0.16:
   dependencies:
     mime-db ">= 1.40.0 < 2"
 
-compression-webpack-plugin@^1.1.6:
-  version "1.1.12"
-  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-1.1.12.tgz#becd2aec620ace96bb3fe9a42a55cf48acc8b4d4"
-  integrity sha512-UpBXSHbrCSdSZieAffqXlAQpLO2fikVVRYibrWlbHYzKpOw1Y4jwkVZ/+S91GzWuJvXSbc8SBy/e8fQJh8uEMQ==
+compression-webpack-plugin@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/compression-webpack-plugin/-/compression-webpack-plugin-3.0.1.tgz#be7a343e6dfbccbd64a77c5fbe29627d140fc321"
+  integrity sha512-FOwoBVzDiwSdJDnZTKXDpAjJU90k8SbChgxnoiYwTo15xjIDJkSC8wFKuc13DymXjgasPEqzS5+2RUgSKXdKKA==
   dependencies:
-    cacache "^10.0.1"
-    find-cache-dir "^1.0.0"
+    cacache "^13.0.1"
+    find-cache-dir "^3.0.0"
     neo-async "^2.5.0"
-    serialize-javascript "^1.4.0"
+    schema-utils "^2.6.1"
+    serialize-javascript "^2.1.2"
     webpack-sources "^1.0.1"
 
 compression@1.7.1:
@@ -2344,7 +2932,7 @@ compression@1.7.1:
     safe-buffer "5.1.1"
     vary "~1.1.2"
 
-compression@^1.7.4:
+compression@^1.5.2, compression@^1.7.4:
   version "1.7.4"
   resolved "https://registry.yarnpkg.com/compression/-/compression-1.7.4.tgz#95523eff170ca57c29a0ca41e6fe131f41e5bb8f"
   integrity sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==
@@ -2362,7 +2950,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@1.6.2, concat-stream@^1.5.0, concat-stream@^1.5.2:
+concat-stream@1.6.2, concat-stream@^1.5.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -2384,7 +2972,7 @@ configstore@^3.0.0:
     write-file-atomic "^2.0.0"
     xdg-basedir "^3.0.0"
 
-connect-history-api-fallback@^1.6.0:
+connect-history-api-fallback@^1.3.0, connect-history-api-fallback@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
   integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
@@ -2433,11 +3021,6 @@ content-type@~1.0.4:
   resolved "https://registry.yarnpkg.com/content-type/-/content-type-1.0.4.tgz#e138cc75e040c727b1966fe5e5f8c9aee256fe3b"
   integrity sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==
 
-convert-source-map@^0.3.3:
-  version "0.3.5"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-0.3.5.tgz#f1d802950af7dd2631a1febe0596550c86ab3190"
-  integrity sha1-8dgClQr33SYxof6+BZZVDIarMZA=
-
 convert-source-map@^1.5.0, convert-source-map@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.5.1.tgz#b8278097b9bc229365de5c62cf5fcaed8b5599e5"
@@ -2483,10 +3066,10 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-copy-webpack-plugin@^4.4.1:
-  version "4.5.2"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.5.2.tgz#d53444a8fea2912d806e78937390ddd7e632ee5c"
-  integrity sha512-zmC33E8FFSq3AbflTvqvPvBo621H36Afsxlui91d+QyZxPIuXghfnTsa1CuqiAaCPgJoSUWfTFbKJnadZpKEbQ==
+copy-webpack-plugin@4.6.0:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-4.6.0.tgz#e7f40dd8a68477d405dd1b7a854aae324b158bae"
+  integrity sha512-Y+SQCF+0NoWQryez2zXn5J5knmr9z/9qSQt7fbL78u83rxmigOy8X5+BFn8CFSuX+nKT8gpYwJX68ekqtQt6ZA==
   dependencies:
     cacache "^10.0.4"
     find-cache-dir "^1.0.0"
@@ -2497,6 +3080,24 @@ copy-webpack-plugin@^4.4.1:
     p-limit "^1.0.0"
     serialize-javascript "^1.4.0"
 
+copy-webpack-plugin@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz#5481a03dea1123d88a988c6ff8b78247214f0b88"
+  integrity sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==
+  dependencies:
+    cacache "^12.0.3"
+    find-cache-dir "^2.1.0"
+    glob-parent "^3.1.0"
+    globby "^7.1.1"
+    is-glob "^4.0.1"
+    loader-utils "^1.2.3"
+    minimatch "^3.0.4"
+    normalize-path "^3.0.0"
+    p-limit "^2.2.1"
+    schema-utils "^1.0.0"
+    serialize-javascript "^2.1.2"
+    webpack-log "^2.0.0"
+
 copyfiles@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/copyfiles/-/copyfiles-2.1.1.tgz#d430e122d7880f92c45d372208b0af03b0c39db6"
@@ -2509,11 +3110,21 @@ copyfiles@^2.1.1:
     through2 "^2.0.1"
     yargs "^13.2.4"
 
-core-js@^2.2.0, core-js@^2.4.0, core-js@^2.5.7:
+core-js-pure@^3.0.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.5.0.tgz#f63c7f2b245e7d678e73f87ad28505480554d70e"
+  integrity sha512-wB0QtKAofWigiISuT1Tej3hKgq932fB//Lf1VoPbiLpTYlHY0nIDhgF+q1na0DAKFHH5wGCirkAknOmDN8ijXA==
+
+core-js@^2.2.0, core-js@^2.4.0:
   version "2.5.7"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.5.7.tgz#f972608ff0cead68b841a16a932d0b183791814e"
   integrity sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==
 
+core-js@^2.6.5:
+  version "2.6.11"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.11.tgz#38831469f9922bded8ee21c9dc46985e0399308c"
+  integrity sha512-5wjnpaT/3dV+XB4borEsnAYQchn00XSgTAWKDkEqv+K8KevjbzmofK6hfJ9TZIlpj2N0xQpazy7PiRQiWHqzWg==
+
 core-js@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.3.0.tgz#fab83fbb0b2d8dc85fa636c4b9d34c75420c6d65"
@@ -2529,25 +3140,14 @@ corser@~2.0.0:
   resolved "https://registry.yarnpkg.com/corser/-/corser-2.0.1.tgz#8eda252ecaab5840dcd975ceb90d9370c819ff87"
   integrity sha1-jtolLsqrWEDc2XXOuQ2TcMgZ/4c=
 
-cosmiconfig@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-4.0.0.tgz#760391549580bbd2df1e562bc177b13c290972dc"
-  integrity sha512-6e5vDdrXZD+t5v0L8CrurPeybg4Fmf+FCSYxXKYVAqLUtyCSbuyqE059d0kDthTNRzKVjL7QMgNpEUlsoYH3iQ==
-  dependencies:
-    is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    parse-json "^4.0.0"
-    require-from-string "^2.0.1"
-
 cosmiconfig@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.1.0.tgz#6c5c35e97f37f985061cdf653f114784231185cf"
-  integrity sha512-kCNPvthka8gvLtzAxQXvWo4FxqRB+ftRZyPZNuab5ngvM9Y7yw7hbEysglptLgpkGX9nAOKTBVkHUAe8xtYR6Q==
+  version "5.2.1"
+  resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-5.2.1.tgz#040f726809c591e77a17c0a3626ca45b4f168b1a"
+  integrity sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==
   dependencies:
     import-fresh "^2.0.0"
     is-directory "^0.3.1"
-    js-yaml "^3.9.0"
-    lodash.get "^4.4.2"
+    js-yaml "^3.13.1"
     parse-json "^4.0.0"
 
 coveralls@3.0.0:
@@ -2619,6 +3219,17 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
+cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.4, cross-spawn@^6.0.5:
+  version "6.0.5"
+  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
+  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
+  dependencies:
+    nice-try "^1.0.4"
+    path-key "^2.0.1"
+    semver "^5.5.0"
+    shebang-command "^1.2.0"
+    which "^1.2.9"
+
 cross-spawn@^3.0.0:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-3.0.1.tgz#1256037ecb9f0c5f79e3d6ef135e30770184b982"
@@ -2636,17 +3247,6 @@ cross-spawn@^5.0.1:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^6.0.0, cross-spawn@^6.0.4, cross-spawn@^6.0.5:
-  version "6.0.5"
-  resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
-  integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==
-  dependencies:
-    nice-try "^1.0.4"
-    path-key "^2.0.1"
-    semver "^5.5.0"
-    shebang-command "^1.2.0"
-    which "^1.2.9"
-
 crypt@~0.0.1:
   version "0.0.2"
   resolved "https://registry.yarnpkg.com/crypt/-/crypt-0.0.2.tgz#88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"
@@ -2697,23 +3297,28 @@ css-declaration-sorter@^4.0.1:
     postcss "^7.0.1"
     timsort "^0.3.0"
 
-css-loader@1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-1.0.0.tgz#9f46aaa5ca41dbe31860e3b62b8e23c42916bf56"
-  integrity sha512-tMXlTYf3mIMt3b0dDCOQFJiVvxbocJ5Ho577WiGPYPZcqVEO218L2iU22pDXzkTZCLDE+9AmGSUkWxeh/nZReA==
+css-loader@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-3.4.0.tgz#9fb263436783117a41d014e45e8eaeba54dd6670"
+  integrity sha512-JornYo4RAXl1Mzt0lOSVPmArzAMV3rGY2VuwtaDc732WTWjdwTaeS19nCGWMcSCf305Q396lhhDAJEWWM0SgPQ==
   dependencies:
-    babel-code-frame "^6.26.0"
-    css-selector-tokenizer "^0.7.0"
-    icss-utils "^2.1.0"
-    loader-utils "^1.0.2"
-    lodash.camelcase "^4.3.0"
-    postcss "^6.0.23"
-    postcss-modules-extract-imports "^1.2.0"
-    postcss-modules-local-by-default "^1.2.0"
-    postcss-modules-scope "^1.1.0"
-    postcss-modules-values "^1.3.0"
-    postcss-value-parser "^3.3.0"
-    source-list-map "^2.0.0"
+    camelcase "^5.3.1"
+    cssesc "^3.0.0"
+    icss-utils "^4.1.1"
+    loader-utils "^1.2.3"
+    normalize-path "^3.0.0"
+    postcss "^7.0.23"
+    postcss-modules-extract-imports "^2.0.0"
+    postcss-modules-local-by-default "^3.0.2"
+    postcss-modules-scope "^2.1.1"
+    postcss-modules-values "^3.0.0"
+    postcss-value-parser "^4.0.2"
+    schema-utils "^2.6.0"
+
+css-parse@1.7.x:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/css-parse/-/css-parse-1.7.0.tgz#321f6cf73782a6ff751111390fc05e2c657d8c9b"
+  integrity sha1-Mh9s9zeCpv91ERE5D8BeLGV9jJs=
 
 css-select-base-adapter@^0.1.1:
   version "0.1.1"
@@ -2740,10 +3345,10 @@ css-select@^2.0.0:
     domutils "^1.7.0"
     nth-check "^1.0.2"
 
-css-selector-tokenizer@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.0.tgz#e6988474ae8c953477bf5e7efecfceccd9cf4c86"
-  integrity sha1-5piEdK6MlTR3v15+/s/OzNnPTIY=
+css-selector-tokenizer@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/css-selector-tokenizer/-/css-selector-tokenizer-0.7.1.tgz#a177271a8bca5019172f4f891fc6eed9cbf68d5d"
+  integrity sha512-xYL0AMZJ4gFzJQsHUKa5jiWWi2vH77WVNg7JYRyewwj6oPh4yb/y6Y9ZCw9dsj/9UauMhtuxR+ogQd//EdEVNA==
   dependencies:
     cssesc "^0.1.0"
     fastparse "^1.1.1"
@@ -2785,16 +3390,6 @@ css-what@^2.1.2:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-2.1.3.tgz#a6d7604573365fe74686c3f311c56513d88285f2"
   integrity sha512-a+EPoD+uZiNfh+5fxw2nO9QwFa6nJe2Or35fGY6Ipw1R3R4AGz1d1TEZrCegvw2YTmZ0jXirGYlzxxpYSHwpEg==
 
-css@^2.0.0:
-  version "2.2.3"
-  resolved "https://registry.yarnpkg.com/css/-/css-2.2.3.tgz#f861f4ba61e79bedc962aa548e5780fd95cbc6be"
-  integrity sha512-0W171WccAjQGGTKLhw4m2nnl0zPHUlTO/I8td4XzJgIB8Hg3ZZx71qT4G4eX8OVsSiaAKiUMy73E3nsbPlg2DQ==
-  dependencies:
-    inherits "^2.0.1"
-    source-map "^0.1.38"
-    source-map-resolve "^0.5.1"
-    urix "^0.1.0"
-
 cssauron@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
@@ -2812,6 +3407,11 @@ cssesc@^2.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-2.0.0.tgz#3b13bd1bb1cb36e1bcb5a4dcd27f54c5dcb35703"
   integrity sha512-MsCAG1z9lPdoO/IUMLSBWBSVxVtJ1395VGIQ+Fc2gNdkQ1hNDnQdw3YhA71WJCBW1vdwA0cAnk/DnW6bqoEUYg==
 
+cssesc@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
+  integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
+
 cssnano-preset-default@^4.0.7:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
@@ -2904,12 +3504,18 @@ cyclist@~0.2.2:
   resolved "https://registry.yarnpkg.com/cyclist/-/cyclist-0.2.2.tgz#1b33792e11e914a2fd6d6ed6447464444e5fa640"
   integrity sha1-GzN5LhHpFKL9bW7WRHRkRE5fpkA=
 
-d@1:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/d/-/d-1.0.0.tgz#754bb5bfe55451da69a58b94d45f4c5b0462d58f"
-  integrity sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=
+d@1, d@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/d/-/d-1.0.1.tgz#8698095372d58dbee346ffd0c7093f99f8f9eb5a"
+  integrity sha512-m62ShEObQ39CfralilEQRjH6oAMtNCV1xJyEx5LpRYUVN+EviphDgUc/F3hnYbADmkiNs67Y+3ylmlG7Lnu+FA==
   dependencies:
-    es5-ext "^0.10.9"
+    es5-ext "^0.10.50"
+    type "^1.0.1"
+
+damerau-levenshtein@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.5.tgz#780cf7144eb2e8dbd1c3bb83ae31100ccc31a414"
+  integrity sha512-CBCRqFnpu715iPmw1KrdOrzRqbdFwQTwAWyyyYS42+iAgHCuXZ+/TdMgQkUENPomxEz9z1BEzuQU2Xw0kUuAgA==
 
 dargs@^5.1.0:
   version "5.1.0"
@@ -2923,10 +3529,10 @@ dashdash@^1.12.0:
   dependencies:
     assert-plus "^1.0.0"
 
-date-format@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
-  integrity sha1-YV6CjiM90aubua4JUODOzPpuytg=
+date-format@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
+  integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
 
 date-now@^0.1.4:
   version "0.1.4"
@@ -2944,9 +3550,17 @@ dateformat@^1.0.11, dateformat@^1.0.6:
 debug-loader@^0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/debug-loader/-/debug-loader-0.0.1.tgz#44dc37e09e3c39e6af334681960f70a534a9d056"
+  integrity sha1-RNw34J48OeavM0aBlg9wpTSp0FY=
   dependencies:
     loader-utils "^0.2.12"
 
+debug@*, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
+  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
+  dependencies:
+    ms "^2.1.1"
+
 debug@2.6.9, debug@^2.1.2, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
@@ -2961,25 +3575,25 @@ debug@3.1.0, debug@^3.1.0, debug@~3.1.0:
   dependencies:
     ms "2.0.0"
 
-debug@^3.2.5:
+debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
   dependencies:
     ms "^2.1.1"
 
-debug@^4.1.0, debug@^4.1.1:
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791"
-  integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==
-  dependencies:
-    ms "^2.1.1"
-
 decamelize@^1.1.1, decamelize@^1.1.2, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
 
+decamelize@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-2.0.0.tgz#656d7bbc8094c4c788ea53c5840908c9c7d063c7"
+  integrity sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==
+  dependencies:
+    xregexp "4.0.0"
+
 decode-uri-component@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/decode-uri-component/-/decode-uri-component-0.2.0.tgz#eb3913333458775cb84cd1a1fae062106bb87545"
@@ -3010,6 +3624,14 @@ deep-is@~0.1.3:
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
 
+default-gateway@^2.6.0:
+  version "2.7.2"
+  resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-2.7.2.tgz#b7ef339e5e024b045467af403d50348db4642d0f"
+  integrity sha512-lAc4i9QJR0YHSDFdzeBQKfZ1SRDG3hsJNEkrpcZa8QhBfidLAilT60BDEIVUUGqosFp425KOgB3uYqcnQrWafQ==
+  dependencies:
+    execa "^0.10.0"
+    ip-regex "^2.1.0"
+
 default-gateway@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/default-gateway/-/default-gateway-4.2.0.tgz#167104c7500c2115f6dd69b0a536bb8ed720552b"
@@ -3060,6 +3682,18 @@ del@^2.2.0:
     pinkie-promise "^2.0.0"
     rimraf "^2.2.8"
 
+del@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/del/-/del-3.0.0.tgz#53ecf699ffcbcb39637691ab13baf160819766e5"
+  integrity sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=
+  dependencies:
+    globby "^6.1.0"
+    is-path-cwd "^1.0.0"
+    is-path-in-cwd "^1.0.0"
+    p-map "^1.1.1"
+    pify "^3.0.0"
+    rimraf "^2.2.8"
+
 del@^4.1.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/del/-/del-4.1.1.tgz#9e8f117222ea44a31ff3a156c049b99052a9f0b4"
@@ -3098,6 +3732,11 @@ dependency-graph@^0.7.0:
   resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.1.tgz#0da960213843d8961d444da58da438bad39343a7"
   integrity sha512-2s2uojwu7aq0K94DwrnJwo/mTkGiPqy2cU7z5BVXmhb564WgITZR3ruZMUIJ8Ymb5ruew244odZCR23/lZoxXg==
 
+dependency-graph@^0.7.2:
+  version "0.7.2"
+  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
+  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
+
 des.js@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/des.js/-/des.js-1.0.0.tgz#c074d2e2aa6a8a9a07dbd61f9a15c2cd83ec8ecc"
@@ -3111,6 +3750,11 @@ destroy@~1.0.4:
   resolved "https://registry.yarnpkg.com/destroy/-/destroy-1.0.4.tgz#978857442c44749e4206613e37946205826abd80"
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
+detect-file@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
+  integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
+
 detect-indent@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/detect-indent/-/detect-indent-4.0.0.tgz#f76d064352cdf43a1cb6ce619c4ee3a9475de208"
@@ -3175,6 +3819,13 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
 dom-converter@~0.1:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/dom-converter/-/dom-converter-0.1.4.tgz#a45ef5727b890c9bffe6d7c876e7b19cb0e17f3b"
@@ -3222,10 +3873,10 @@ domhandler@2.1:
   dependencies:
     domelementtype "1"
 
-domino@^2.0.1:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.0.tgz#653ba7d331441113b42e40ba05f24253ec86e02e"
-  integrity sha512-xINSODvrnuQcm3eXJN4IkBR+JxqLrJN8Ge4fd00y1b7HsY0A4huKN5BflSS/oo8quBWmocTfWdFvrw2H8TjGqQ==
+domino@^2.1.0:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/domino/-/domino-2.1.4.tgz#78922e7fab7c610f35792b6c745b7962d342e9c4"
+  integrity sha512-l70mlQ7IjPKC8kT7GljQXJZmt5OqFL+RE91ik5y5WWQtsd9wP8R7gpFnNu96fK5MqAAZRXfLLsnzKtkty5fWGQ==
 
 domutils@1.1:
   version "1.1.6"
@@ -3322,6 +3973,11 @@ electron-to-chromium@^1.3.30, electron-to-chromium@^1.3.61:
   resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.62.tgz#2e8e2dc070c800ec8ce23ff9dfcceb585d6f9ed8"
   integrity sha512-x09ndL/Gjnuk3unlAyoGyUg3wbs4w/bXurgL7wL913vXHAOWmMhrLf1VNGRaMLngmadd5Q8gsV9BFuIr6rP+Xg==
 
+electron-to-chromium@^1.3.322:
+  version "1.3.322"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.322.tgz#a6f7e1c79025c2b05838e8e344f6e89eb83213a8"
+  integrity sha512-Tc8JQEfGQ1MzfSzI/bTlSr7btJv/FFO7Yh6tanqVmIWOuNCu6/D1MilIEgLtmWqIrsv+o4IjpLAhgMBr/ncNAA==
+
 elliptic@^6.0.0:
   version "6.4.1"
   resolved "https://registry.yarnpkg.com/elliptic/-/elliptic-6.4.1.tgz#c2d0b7776911b86722c632c3c06c60f2f819939a"
@@ -3340,6 +3996,11 @@ emoji-regex@^7.0.1:
   resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-7.0.3.tgz#933a04052860c85e83c122479c4748a8e4c72156"
   integrity sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==
 
+emoji-regex@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
+  integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
+
 emojis-list@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/emojis-list/-/emojis-list-2.1.0.tgz#4daa4d9db00f9819880c79fa457ae5b09a1fd389"
@@ -3404,7 +4065,7 @@ engine.io@~3.2.0:
     engine.io-parser "~2.1.0"
     ws "~3.3.1"
 
-enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
+enhanced-resolve@4.1.0, enhanced-resolve@^4.0.0, enhanced-resolve@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.0.tgz#41c7e0bfdfe74ac1ffe1e57ad6a5c6c9f3742a7f"
   integrity sha512-F/7vkyTtyc/llOIn8oWclcB25KdRaiPBpZYDgJHgh/UHtpgT2p2eldQgtQnLtUvfMKPKxbRaQM/hHkvLHt1Vng==
@@ -3423,7 +4084,12 @@ entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.1.tgz#6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"
   integrity sha1-blwtClYhtdra7O+AuQ7ftc13cvA=
 
-errno@^0.1.3, errno@~0.1.7:
+err-code@^1.0.0:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/err-code/-/err-code-1.1.2.tgz#06e0116d3028f6aef4806849eb0ea6a748ae6960"
+  integrity sha1-BuARbTAo9q70gGhJ6w6mp0iuaWA=
+
+errno@^0.1.1, errno@^0.1.3, errno@~0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/errno/-/errno-0.1.7.tgz#4684d71779ad39af177e3f007996f7c67c852618"
   integrity sha512-MfrRBDWzIWifgq6tJj60gkAwtLNb6sQPlcFrSOflcP1aFmmruKQ2wRnze/8V6kgyz7H3FF8Npzv78mZ7XLLflg==
@@ -3485,14 +4151,14 @@ es-to-primitive@^1.2.0:
     is-date-object "^1.0.1"
     is-symbol "^1.0.2"
 
-es5-ext@^0.10.35, es5-ext@^0.10.9, es5-ext@~0.10.14:
-  version "0.10.46"
-  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.46.tgz#efd99f67c5a7ec789baa3daa7f79870388f7f572"
-  integrity sha512-24XxRvJXNFwEMpJb3nOkiRJKRoupmjYmOPVlI65Qy2SrtxwOTB+g6ODjBKOtwEHbYrhWRty9xxOWLNdClT2djw==
+es5-ext@^0.10.35, es5-ext@^0.10.50:
+  version "0.10.53"
+  resolved "https://registry.yarnpkg.com/es5-ext/-/es5-ext-0.10.53.tgz#93c5a3acfdbef275220ad72644ad02ee18368de1"
+  integrity sha512-Xs2Stw6NiNHWypzRTY1MtaG/uJlwCk8kH81920ma8mvN8Xq1gsfhZvpkImLQArw8AHnv8MT2I45J3c0R8slE+Q==
   dependencies:
     es6-iterator "~2.0.3"
-    es6-symbol "~3.1.1"
-    next-tick "1"
+    es6-symbol "~3.1.3"
+    next-tick "~1.0.0"
 
 es6-iterator@~2.0.3:
   version "2.0.3"
@@ -3525,13 +4191,13 @@ es6-promisify@^6.0.0:
   resolved "https://registry.yarnpkg.com/es6-promisify/-/es6-promisify-6.0.1.tgz#6edaa45f3bd570ffe08febce66f7116be4b1cdb6"
   integrity sha512-J3ZkwbEnnO+fGAKrjVpeUAnZshAdfZvbhQpqfIH9kSAspReRC4nJnu8ewm55b4y9ElyeuhCTzJD0XiH8Tsbhlw==
 
-es6-symbol@^3.1.1, es6-symbol@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.1.tgz#bf00ef4fdab6ba1b46ecb7b629b4c7ed5715cc77"
-  integrity sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=
+es6-symbol@^3.1.0, es6-symbol@^3.1.1, es6-symbol@~3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/es6-symbol/-/es6-symbol-3.1.3.tgz#bad5d3c1bcdac28269f4cb331e431c78ac705d18"
+  integrity sha512-NJ6Yn3FuDinBaBRWl/q5X/s4koRHBrgKAu+yGI6JCBeiu3qrcbJhwT2GeR/EXVfylRk8dpQVJoLEFhK+Mu31NA==
   dependencies:
-    d "1"
-    es5-ext "~0.10.14"
+    d "^1.0.1"
+    ext "^1.1.2"
 
 escape-html@~1.0.3:
   version "1.0.3"
@@ -3563,6 +4229,86 @@ eslint-scope@^4.0.0:
     esrecurse "^4.1.0"
     estraverse "^4.1.1"
 
+eslint-scope@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-4.0.3.tgz#ca03833310f6889a3264781aa82e63eb9cfe7848"
+  integrity sha512-p7VutNr1O/QrxysMo3E45FjYDTeXBy0iTltPFNSqKAIfjDSXC+4dj+qfyuD8bfAXrW/y6lW3O76VaYNPKfpKrg==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-scope@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz#e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"
+  integrity sha512-oYrhJW7S0bxAFDvWqzvMPRm6pcgcnWc4QnofCAqRTRfQC0JcwenzGglTtsLyIuuWFfkqDG9vz67cnttSd53djw==
+  dependencies:
+    esrecurse "^4.1.0"
+    estraverse "^4.1.1"
+
+eslint-utils@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-1.4.3.tgz#74fec7c54d0776b6f67e0251040b5806564e981f"
+  integrity sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-visitor-keys@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz#e2a82cea84ff246ad6fb57f9bde5b46621459ec2"
+  integrity sha512-8y9YjtM1JBJU/A9Kc+SbaOV4y29sSWckBwMHa+FGtVj5gN/sbnKDf6xJUl+8g7FAij9LVaP8C24DUiH/f/2Z9A==
+
+eslint@^6.7.2:
+  version "6.7.2"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-6.7.2.tgz#c17707ca4ad7b2d8af986a33feba71e18a9fecd1"
+  integrity sha512-qMlSWJaCSxDFr8fBPvJM9kJwbazrhNcBU3+DszDW1OlEwKBBRWsJc7NJFelvwQpanHCR14cOLD41x8Eqvo3Nng==
+  dependencies:
+    "@babel/code-frame" "^7.0.0"
+    ajv "^6.10.0"
+    chalk "^2.1.0"
+    cross-spawn "^6.0.5"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    eslint-scope "^5.0.0"
+    eslint-utils "^1.4.3"
+    eslint-visitor-keys "^1.1.0"
+    espree "^6.1.2"
+    esquery "^1.0.1"
+    esutils "^2.0.2"
+    file-entry-cache "^5.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.0.0"
+    globals "^12.1.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    inquirer "^7.0.0"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.3.0"
+    lodash "^4.17.14"
+    minimatch "^3.0.4"
+    mkdirp "^0.5.1"
+    natural-compare "^1.4.0"
+    optionator "^0.8.3"
+    progress "^2.0.0"
+    regexpp "^2.0.1"
+    semver "^6.1.2"
+    strip-ansi "^5.2.0"
+    strip-json-comments "^3.0.1"
+    table "^5.2.3"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+espree@^6.1.2:
+  version "6.1.2"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-6.1.2.tgz#6c272650932b4f91c3714e5e7b5f5e2ecf47262d"
+  integrity sha512-2iUPuuPP+yW1PZaMSDM9eyVf8D5P0Hi8h83YtZ5bPc/zHYjII5khoixIUTMO794NOY8F/ThF1Bo8ncZILarUTA==
+  dependencies:
+    acorn "^7.1.0"
+    acorn-jsx "^5.1.0"
+    eslint-visitor-keys "^1.1.0"
+
 esprima@2.7.x, esprima@^2.7.1:
   version "2.7.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-2.7.3.tgz#96e3b70d5779f6ad49cd032673d1c312767ba581"
@@ -3573,6 +4319,13 @@ esprima@^4.0.0:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
+esquery@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.0.1.tgz#406c51658b1f5991a5f9b62b1dc25b00e3e5c708"
+  integrity sha512-SmiyZ5zIWH9VM+SRUReLS5Q8a7GxtRdxEBVZpm98rJM7Sb+A9DVCndXfkeFUd3byderg+EbDkfnevfCwynWaNA==
+  dependencies:
+    estraverse "^4.0.0"
+
 esrecurse@^4.1.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz#007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"
@@ -3585,6 +4338,11 @@ estraverse@^1.9.1:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-1.9.3.tgz#af67f2dc922582415950926091a4005d29c9bb44"
   integrity sha1-r2fy3JIlgkFZUJJgkaQAXSnJu0Q=
 
+estraverse@^4.0.0:
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
+  integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
+
 estraverse@^4.1.0, estraverse@^4.1.1:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.2.0.tgz#0dee3fed31fcd469618ce7342099fc1afa0bdb13"
@@ -3596,9 +4354,9 @@ estree-walker@^0.5.1, estree-walker@^0.5.2:
   integrity sha512-XpCnW/AE10ws/kDAs37cngSkvgIR8aN3G0MS85m7dUpuK2EREo9VJ00uvw6Dg/hXEpfsE1I1TvJOJr+Z+TL+ig==
 
 esutils@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.2.tgz#0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"
-  integrity sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64"
+  integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==
 
 etag@~1.8.1:
   version "1.8.1"
@@ -3623,11 +4381,21 @@ eventemitter3@^3.0.0:
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-3.1.0.tgz#090b4d6cdbd645ed10bf750d4b5407942d7ba163"
   integrity sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==
 
+eventemitter3@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz#d65176163887ee59f386d64c82610b696a4a74eb"
+  integrity sha512-qerSRB0p+UDEssxTtm6EDKcE7W4OaoisfIMl4CngyEhjpYglocpNg6UEqCvemdGhosAsg4sO2dXJOdyBifPGCg==
+
 events@^1.0.0:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
   integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
 
+events@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.0.0.tgz#9a0a0dfaf62893d92b875b8f2698ca4114973e88"
+  integrity sha512-Dc381HFWJzEOhQ+d8pkNon++bk9h6cdAoAj4iE6Q4y6xgTzySWXlKn05/TVNpjnfRqi/X0EpJEJohPjNI3zpVA==
+
 eventsource@^1.0.7:
   version "1.0.7"
   resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
@@ -3687,15 +4455,6 @@ exit@^0.1.2:
   resolved "https://registry.yarnpkg.com/exit/-/exit-0.1.2.tgz#0632638f8d877cc82107d30a0fff1a17cba1cd0c"
   integrity sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=
 
-expand-braces@^0.1.1:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/expand-braces/-/expand-braces-0.1.2.tgz#488b1d1d2451cb3d3a6b192cfc030f44c5855fea"
-  integrity sha1-SIsdHSRRyz06axks/AMPRMWFX+o=
-  dependencies:
-    array-slice "^0.2.3"
-    array-unique "^0.2.1"
-    braces "^0.1.2"
-
 expand-brackets@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/expand-brackets/-/expand-brackets-0.1.5.tgz#df07284e342a807cd733ac5af72411e581d1177b"
@@ -3716,14 +4475,6 @@ expand-brackets@^2.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-expand-range@^0.1.0:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-0.1.1.tgz#4cb8eda0993ca56fa4f41fc42f3cbb4ccadff044"
-  integrity sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=
-  dependencies:
-    is-number "^0.1.1"
-    repeat-string "^0.2.2"
-
 expand-range@^1.8.1:
   version "1.8.2"
   resolved "https://registry.yarnpkg.com/expand-range/-/expand-range-1.8.2.tgz#a299effd335fe2721ebae8e257ec79644fc85337"
@@ -3731,6 +4482,13 @@ expand-range@^1.8.1:
   dependencies:
     fill-range "^2.1.0"
 
+expand-tilde@^2.0.0, expand-tilde@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/expand-tilde/-/expand-tilde-2.0.2.tgz#97e801aa052df02454de46b02bf621642cdc8502"
+  integrity sha1-l+gBqgUt8CRU3kawK/YhZCzchQI=
+  dependencies:
+    homedir-polyfill "^1.0.1"
+
 exports-loader@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/exports-loader/-/exports-loader-0.7.0.tgz#84881c784dea6036b8e1cd1dac3da9b6409e21a5"
@@ -3790,7 +4548,7 @@ express@4.16.2:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
-express@^4.16.3, express@^4.17.1:
+express@^4.16.2, express@^4.16.3, express@^4.17.1:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
   integrity sha512-mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g==
@@ -3826,6 +4584,13 @@ express@^4.16.3, express@^4.17.1:
     utils-merge "1.0.1"
     vary "~1.1.2"
 
+ext@^1.1.2:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/ext/-/ext-1.4.0.tgz#89ae7a07158f79d35517882904324077e4379244"
+  integrity sha512-Key5NIsUxdqKg3vIsdw9dSuXpPCQ297y6wBjL30edxwPgt2E44WcWBZey/ZvUc6sERLTxKdyCu4gZFmUbk1Q7A==
+  dependencies:
+    type "^2.0.0"
+
 extend-shallow@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/extend-shallow/-/extend-shallow-1.1.4.tgz#19d6bf94dfc09d76ba711f39b872d21ff4dd9071"
@@ -3871,6 +4636,15 @@ external-editor@^3.0.0:
     iconv-lite "^0.4.24"
     tmp "^0.0.33"
 
+external-editor@^3.0.3:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/external-editor/-/external-editor-3.1.0.tgz#cb03f740befae03ea4d283caed2741a83f335495"
+  integrity sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==
+  dependencies:
+    chardet "^0.7.0"
+    iconv-lite "^0.4.24"
+    tmp "^0.0.33"
+
 extglob@^0.3.1:
   version "0.3.2"
   resolved "https://registry.yarnpkg.com/extglob/-/extglob-0.3.2.tgz#2e18ff3d2f49ab2765cec9023f011daa8d8349a1"
@@ -3960,20 +4734,25 @@ fast-json-patch@^2.0.7:
   dependencies:
     deep-equal "^1.0.1"
 
-fast-json-stable-stringify@^2.0.0:
+fast-json-stable-stringify@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz#d5142c0caee6b1189f87d3a76111064f86c8bbf2"
   integrity sha1-1RQsDK7msRifh9OnYREGT4bIu/I=
 
-fast-levenshtein@~2.0.4:
+fast-json-stable-stringify@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
+  integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
+
+fast-levenshtein@~2.0.4, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fastparse@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.1.tgz#d1e2643b38a94d7583b479060e6c4affc94071f8"
-  integrity sha1-0eJkOzipTXWDtHkGDmxK/8lAcfg=
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/fastparse/-/fastparse-1.1.2.tgz#91728c5a5942eced8531283c79441ee4122c35a9"
+  integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
 faye-websocket@^0.10.0:
   version "0.10.0"
@@ -3996,6 +4775,11 @@ fd-slicer@~1.0.1:
   dependencies:
     pend "~1.2.0"
 
+figgy-pudding@^3.4.1, figgy-pudding@^3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
+  integrity sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==
+
 figures@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/figures/-/figures-2.0.0.tgz#3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"
@@ -4003,6 +4787,28 @@ figures@^2.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+figures@^3.0.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/figures/-/figures-3.1.0.tgz#4b198dd07d8d71530642864af2d45dd9e459c4ec"
+  integrity sha512-ravh8VRXqHuMvZt/d8GblBeqDMkdJMBdv/2KntFH+ra5MXkO7nxNKpzQ3n6QD/2da1kH0aWmNISdvhM7gl2gVg==
+  dependencies:
+    escape-string-regexp "^1.0.5"
+
+file-entry-cache@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-5.0.1.tgz#ca0f6efa6dd3d561333fb14515065c2fafdf439c"
+  integrity sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==
+  dependencies:
+    flat-cache "^2.0.1"
+
+file-loader@3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/file-loader/-/file-loader-3.0.1.tgz#f8e0ba0b599918b51adfe45d66d1e771ad560faa"
+  integrity sha512-4sNIOXgtH/9WZq4NvlfU3Opn5ynUsqBwSLyM+I7UOwdGigTBYfVVQEwe/msZNX/j4pCJTIM14Fsw66Svo1oVrw==
+  dependencies:
+    loader-utils "^1.0.2"
+    schema-utils "^1.0.0"
+
 file-saver@^1.3.8:
   version "1.3.8"
   resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8"
@@ -4074,6 +4880,24 @@ find-cache-dir@^1.0.0:
     make-dir "^1.0.0"
     pkg-dir "^2.0.0"
 
+find-cache-dir@^2.0.0, find-cache-dir@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-2.1.0.tgz#8d0f94cd13fe43c6c7c261a0d86115ca918c05f7"
+  integrity sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^2.0.0"
+    pkg-dir "^3.0.0"
+
+find-cache-dir@^3.0.0, find-cache-dir@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/find-cache-dir/-/find-cache-dir-3.2.0.tgz#e7fe44c1abc1299f516146e563108fd1006c1874"
+  integrity sha512-1JKclkYYsf1q9WIJKLZa9S9muC+08RIjzAlLrK4QcYLJMS6mk9yombQ9qf+zJ7H9LS800k0s44L4sDq9VYzqyg==
+  dependencies:
+    commondir "^1.0.1"
+    make-dir "^3.0.0"
+    pkg-dir "^4.1.0"
+
 find-up@^1.0.0:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
@@ -4082,7 +4906,7 @@ find-up@^1.0.0:
     path-exists "^2.0.0"
     pinkie-promise "^2.0.0"
 
-find-up@^2.1.0:
+find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -4096,6 +4920,38 @@ find-up@^3.0.0:
   dependencies:
     locate-path "^3.0.0"
 
+find-up@^4.0.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/find-up/-/find-up-4.1.0.tgz#97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"
+  integrity sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==
+  dependencies:
+    locate-path "^5.0.0"
+    path-exists "^4.0.0"
+
+findup-sync@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/findup-sync/-/findup-sync-3.0.0.tgz#17b108f9ee512dfb7a5c7f3c8b27ea9e1a9c08d1"
+  integrity sha512-YbffarhcicEhOrm4CtrwdKBdCuz576RLdhJDsIfvNtxUuhdRet1qZcsMjqbePtAseKdAnDyM/IyXbu7PRPRLYg==
+  dependencies:
+    detect-file "^1.0.0"
+    is-glob "^4.0.0"
+    micromatch "^3.0.4"
+    resolve-dir "^1.0.1"
+
+flat-cache@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-2.0.1.tgz#5d296d6f04bda44a4630a301413bdbc2ec085ec0"
+  integrity sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==
+  dependencies:
+    flatted "^2.0.0"
+    rimraf "2.6.3"
+    write "1.0.3"
+
+flatted@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz#69e57caa8f0eacbc281d2e2cb458d46fdb449e08"
+  integrity sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==
+
 flatten@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.2.tgz#dae46a9d78fbe25292258cc1e780a41d95c03782"
@@ -4253,6 +5109,15 @@ fs-extra@^7.0.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
 fs-minipass@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.5.tgz#06c277218454ec288df77ada54a03b8702aacb9d"
@@ -4260,6 +5125,13 @@ fs-minipass@^1.2.5:
   dependencies:
     minipass "^2.2.1"
 
+fs-minipass@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.0.0.tgz#a6415edab02fae4b9e9230bc87ee2e4472003cd1"
+  integrity sha512-40Qz+LFXmd9tzYVnnBmZvFfvAADfUA14TXPK1s7IfElJTIZ97rA8w4Kin7Wt5JBrC3ShnnFJO/5vPjPEeJIq9A==
+  dependencies:
+    minipass "^3.0.0"
+
 fs-write-stream-atomic@^1.0.8:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz#b47df53493ef911df75731e70a9ded0189db40c9"
@@ -4275,7 +5147,7 @@ fs.realpath@^1.0.0:
   resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
   integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8=
 
-fsevents@^1.0.0, fsevents@^1.2.2:
+fsevents@^1.2.2:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.4.tgz#f41dcb1af2582af3692da36fc55cbd8e1041c426"
   integrity sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==
@@ -4306,6 +5178,11 @@ function-bind@^1.0.2, function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
 gauge@~2.7.3:
   version "2.7.4"
   resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
@@ -4327,6 +5204,11 @@ gaze@^1.0.0:
   dependencies:
     globule "^1.0.0"
 
+genfun@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/genfun/-/genfun-5.0.0.tgz#9dd9710a06900a5c4a5bf57aca5da4e52fe76537"
+  integrity sha512-KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA==
+
 get-caller-file@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz#f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"
@@ -4352,7 +5234,7 @@ get-stream@^3.0.0:
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-3.0.0.tgz#8e943d1358dc37555054ecbe2edb05aa174ede14"
   integrity sha1-jpQ9E1jcN1VQVOy+LtsFqhdO3hQ=
 
-get-stream@^4.0.0:
+get-stream@^4.0.0, get-stream@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
   integrity sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==
@@ -4394,11 +5276,30 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
+glob-parent@^5.0.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"
+  integrity sha512-qjtRgnIVmOfnKUE3NJAQEdk+lKrxfw8t5ke7SXtfMTHcjsBfOfWXCQfdb30zfDoZQ2IRSIiidmjtbHZPZ++Ihw==
+  dependencies:
+    is-glob "^4.0.1"
+
 glob-to-regexp@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz#8c5a1494d2066c570cc3bfe4496175acc4d502ab"
   integrity sha1-jFoUlNIGbFcMw7/kSWF1rMTVAqs=
 
+glob@7.0.x:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.0.6.tgz#211bafaf49e525b8cd93260d14ab136152b3f57a"
+  integrity sha1-IRuvr0nlJbjNkyYNFKsTYVKz9Xo=
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.2"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@7.1.2:
   version "7.1.2"
   resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
@@ -4411,6 +5312,18 @@ glob@7.1.2:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
+glob@7.1.3, glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
+  version "7.1.3"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
+  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
 glob@^5.0.15:
   version "5.0.15"
   resolved "https://registry.yarnpkg.com/glob/-/glob-5.0.15.tgz#1bc936b9e02f4a603fcc222ecf7633d30b8b93b1"
@@ -4422,10 +5335,10 @@ glob@^5.0.15:
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, glob@~7.1.1:
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.3.tgz#3960832d3f1574108342dafd3a67b332c0969df1"
-  integrity sha512-vcfuiIxogLV4DlGBHIUOwI0IbrJ8HWPc4MU7HzviGeNho/UJDfi6B5p3sHeWIQ0KGIU0Jpxi5ZHxemQfLkkAwQ==
+glob@^7.1.3, glob@^7.1.4:
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
+  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4434,10 +5347,10 @@ glob@^7.0.0, glob@^7.0.3, glob@^7.0.5, glob@^7.0.6, glob@^7.1.1, glob@^7.1.2, gl
     once "^1.3.0"
     path-is-absolute "^1.0.0"
 
-glob@^7.1.3, glob@^7.1.4:
-  version "7.1.4"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.4.tgz#aa608a2f6c577ad357e1ae5a5c26d9a8d1969255"
-  integrity sha512-hkLPepehmnKk41pUGm3sYxoFs/umurYfYJCerbXEyFIWcAzvpipAgVkBqqT9RBKMGjnq6kMuyYwha6csxbiM1A==
+glob@^7.1.6:
+  version "7.1.6"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6"
+  integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -4453,10 +5366,48 @@ global-dirs@^0.1.0:
   dependencies:
     ini "^1.3.4"
 
-global-modules-path@^2.1.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/global-modules-path/-/global-modules-path-2.3.0.tgz#b0e2bac6beac39745f7db5c59d26a36a0b94f7dc"
-  integrity sha512-HchvMJNYh9dGSCy8pOQ2O8u/hoXaL+0XhnrwH0RyLiSXMMTl9W3N6KUU73+JFOg5PGjtzl6VZzUQsnrpm7Szag==
+global-modules@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-2.0.0.tgz#997605ad2345f27f51539bea26574421215c7780"
+  integrity sha512-NGbfmJBp9x8IxyJSd1P+otYK8vonoJactOogrVfFRIAEY1ukil8RSKDz2Yo7wh1oihl51l/r6W4epkeKJHqL8A==
+  dependencies:
+    global-prefix "^3.0.0"
+
+global-modules@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/global-modules/-/global-modules-1.0.0.tgz#6d770f0eb523ac78164d72b5e71a8877265cc3ea"
+  integrity sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==
+  dependencies:
+    global-prefix "^1.0.1"
+    is-windows "^1.0.1"
+    resolve-dir "^1.0.0"
+
+global-prefix@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-1.0.2.tgz#dbf743c6c14992593c655568cb66ed32c0122ebe"
+  integrity sha1-2/dDxsFJklk8ZVVoy2btMsASLr4=
+  dependencies:
+    expand-tilde "^2.0.2"
+    homedir-polyfill "^1.0.1"
+    ini "^1.3.4"
+    is-windows "^1.0.1"
+    which "^1.2.14"
+
+global-prefix@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/global-prefix/-/global-prefix-3.0.0.tgz#fc85f73064df69f50421f47f883fe5b913ba9b97"
+  integrity sha512-awConJSVCHVGND6x3tmMaKcQvwXLhjdkmomy2W+Goaui8YPgYgXJZewhg3fWC+DlfqqQuWg8AwqjGTD2nAPVWg==
+  dependencies:
+    ini "^1.3.5"
+    kind-of "^6.0.2"
+    which "^1.3.1"
+
+globals@^12.1.0:
+  version "12.3.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-12.3.0.tgz#1e564ee5c4dded2ab098b0f88f24702a3c56be13"
+  integrity sha512-wAfjdLgFsPZsklLJvOBUBmzYE8/CwhEqSBEMRXA3qxIiNtyqvjYurAtIfDh6chlEPUfmTY3MnZh5Hfh4q0UlIw==
+  dependencies:
+    type-fest "^0.8.1"
 
 globals@^9.18.0:
   version "9.18.0"
@@ -4556,6 +5507,11 @@ graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.6, graceful-fs@^4.1.9:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
   integrity sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=
 
+graceful-fs@^4.1.15, graceful-fs@^4.2.2:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
+  integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
+
 graceful-fs@^4.2.0:
   version "4.2.1"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.1.tgz#1c1f0c364882c868f5bff6512146328336a11b1d"
@@ -4618,15 +5574,20 @@ gzip-size@^5.0.0:
     duplexer "^0.1.1"
     pify "^4.0.1"
 
+hammerjs@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1"
+  integrity sha1-BO93hiz/K7edMPdpIJWTAiK/YPE=
+
 handle-thing@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz#0e039695ff50c93fc288557d696f3c1dc6776754"
   integrity sha512-d4sze1JNC454Wdo2fkuyzCr6aHcbL6PGGuFAz0Li/NcOm1tCHGnWDRmJP85dh9IhQErTc2svWFEX5xHIOo//kQ==
 
 handlebars@^4.0.1, handlebars@^4.0.6:
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.1.2.tgz#b6b37c1ced0306b221e094fc7aca3ec23b131b67"
-  integrity sha512-nvfrjqvt9xQ8Z/w0ijewdD/vvWDTOweBUm96NTr66Wfvo1mJenBLwcYmPs3TIBP5ruzYGD7Hx/DaM9RmhroGPw==
+  version "4.5.3"
+  resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.5.3.tgz#5cf75bd8714f7605713511a56be7c349becb0482"
+  integrity sha512-3yPecJoJHK/4c6aZhSvxOyG4vJKDshV36VHp0iVCDVh7o9w2vwi3NSnL2MMPj3YdduqaBcu7cGbggJQM0br9xA==
   dependencies:
     neo-async "^2.6.0"
     optimist "^0.6.1"
@@ -4755,12 +5716,12 @@ hasha@^2.2.0:
     is-stream "^1.0.1"
     pinkie-promise "^2.0.0"
 
-he@1.1.1, he@1.1.x:
+he@1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/he/-/he-1.1.1.tgz#93410fd21b009735151f8868c2f271f3427e23fd"
   integrity sha1-k0EP0hsAlzUVH4howvJx80J+I/0=
 
-he@^1.1.1:
+he@1.2.x, he@^1.1.1:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f"
   integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==
@@ -4801,6 +5762,11 @@ hosted-git-info@^2.1.4, hosted-git-info@^2.6.0:
   resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.7.1.tgz#97f236977bd6e125408930ff6de3eec6281ec047"
   integrity sha512-7T/BxH19zbcCTa8XkMlbK5lTo1WtgkFi3GvdWEyNuc4Vex7/9Dqbnpsf4JMydcfj9HCg4zUWFTL3Za6lapg5/w==
 
+hosted-git-info@^2.7.1:
+  version "2.8.5"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.5.tgz#759cfcf2c4d156ade59b0b2dfabddc42a6b9c70c"
+  integrity sha512-kssjab8CvdXfcXMXVcvsXum4Hwdq9XGtRD3TteMEvEbq0LXyiNQr6AprqKqfeaDXze7SxWvRxdpwE6ku7ikLkg==
+
 hpack.js@^2.1.6:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/hpack.js/-/hpack.js-2.1.6.tgz#87774c0949e513f42e84575b3c45681fade2a0b2"
@@ -4826,35 +5792,35 @@ html-comment-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
   integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
 
-html-entities@^1.2.1:
+html-entities@^1.2.0, html-entities@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz#0df29351f0721163515dfb9e5543e5f6eed5162f"
   integrity sha1-DfKTUfByEWNRXfueVUPl9u7VFi8=
 
 html-minifier@^3.2.3:
-  version "3.5.20"
-  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.20.tgz#7b19fd3caa0cb79f7cde5ee5c3abdf8ecaa6bb14"
-  integrity sha512-ZmgNLaTp54+HFKkONyLFEfs5dd/ZOtlquKaTnqIWFmx3Av5zG6ZPcV2d0o9XM2fXOTxxIf6eDcwzFFotke/5zA==
+  version "3.5.21"
+  resolved "https://registry.yarnpkg.com/html-minifier/-/html-minifier-3.5.21.tgz#d0040e054730e354db008463593194015212d20c"
+  integrity sha512-LKUKwuJDhxNa3uf/LPR/KVjm/l3rBqtYeCOAekvG8F1vItxMUpueGd94i/asDDr8/1u7InxzFA5EeGjhhG5mMA==
   dependencies:
     camel-case "3.0.x"
     clean-css "4.2.x"
     commander "2.17.x"
-    he "1.1.x"
+    he "1.2.x"
     param-case "2.1.x"
     relateurl "0.2.x"
     uglify-js "3.4.x"
 
-html-webpack-plugin@^4.0.0-alpha:
-  version "4.0.0-alpha"
-  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-4.0.0-alpha.tgz#b2c7b6d4885a209c999dfce3ffb9866e2c8c0eaa"
-  integrity sha1-sse21IhaIJyZnfzj/7mGbiyMDqo=
+html-webpack-plugin@3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-3.2.0.tgz#b01abbd723acaaa7b37b6af4492ebda03d9dd37b"
+  integrity sha1-sBq71yOsqqeze2r0SS69oD2d03s=
   dependencies:
-    "@types/tapable" "1.0.2"
     html-minifier "^3.2.3"
-    loader-utils "^1.1.0"
-    lodash "^4.17.10"
+    loader-utils "^0.2.16"
+    lodash "^4.17.3"
     pretty-error "^2.0.2"
     tapable "^1.0.0"
+    toposort "^1.0.0"
     util.promisify "1.0.0"
 
 htmlparser2@~3.3.0:
@@ -4867,6 +5833,11 @@ htmlparser2@~3.3.0:
     domutils "1.1"
     readable-stream "1.0"
 
+http-cache-semantics@^3.8.1:
+  version "3.8.1"
+  resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-3.8.1.tgz#39b0e16add9b605bf0a9ef3d9daaf4843b4cacd2"
+  integrity sha512-5ai2iksyV8ZXmnZhHH4rWPoxxistEexSi5936zIQ1bnNTW5VnA85B6P/VpXiRM017IgRvb2kKo1a//y+0wSp3w==
+
 http-deceiver@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/http-deceiver/-/http-deceiver-1.2.7.tgz#fa7168944ab9a519d337cb0bec7284dc3e723d87"
@@ -4908,6 +5879,14 @@ http-parser-js@>=0.4.0:
   resolved "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.13.tgz#3bd6d6fde6e3172c9334c3b33b6c193d80fe1137"
   integrity sha1-O9bW/ebjFyyTNMOzO2wZPYD+ETc=
 
+http-proxy-agent@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz#e4821beef5b2142a2026bd73926fe537631c5405"
+  integrity sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==
+  dependencies:
+    agent-base "4"
+    debug "3.1.0"
+
 http-proxy-middleware@^0.19.1:
   version "0.19.1"
   resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.19.1.tgz#183c7dc4aa1479150306498c210cdaf96080a43a"
@@ -4918,6 +5897,16 @@ http-proxy-middleware@^0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
+http-proxy-middleware@~0.18.0:
+  version "0.18.0"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-0.18.0.tgz#0987e6bb5a5606e5a69168d8f967a87f15dd8aab"
+  integrity sha512-Fs25KVMPAIIcgjMZkVHJoKg9VcXcC1C8yb9JUgeDvVXY0S/zgVIhMb+qVswDIgtJe2DfckMSY2d6TuTEutlk6Q==
+  dependencies:
+    http-proxy "^1.16.2"
+    is-glob "^4.0.0"
+    lodash "^4.17.5"
+    micromatch "^3.1.9"
+
 http-proxy@^1.13.0, http-proxy@^1.17.0, http-proxy@^1.8.1:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.17.0.tgz#7ad38494658f84605e2f6db4436df410f4e5be9a"
@@ -4927,6 +5916,15 @@ http-proxy@^1.13.0, http-proxy@^1.17.0, http-proxy@^1.8.1:
     follow-redirects "^1.0.0"
     requires-port "^1.0.0"
 
+http-proxy@^1.16.2:
+  version "1.18.0"
+  resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz#dbe55f63e75a347db7f3d99974f2692a314a6a3a"
+  integrity sha512-84I2iJM/n1d4Hdgc6y2+qY5mDaz2PUVjlg9znE9byl+q0uC3DeByqBGReQu5tpLK0TAqTIXScRUV+dg7+bUPpQ==
+  dependencies:
+    eventemitter3 "^4.0.0"
+    follow-redirects "^1.0.0"
+    requires-port "^1.0.0"
+
 http-server@0.11.1:
   version "0.11.1"
   resolved "https://registry.yarnpkg.com/http-server/-/http-server-0.11.1.tgz#2302a56a6ffef7f9abea0147d838a5e9b6b6a79b"
@@ -4968,6 +5966,13 @@ https@1.0.0:
   resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
   integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
 
+humanize-ms@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
+  integrity sha1-xG4xWaKT9riW2ikxbYtv6Lt5u+0=
+  dependencies:
+    ms "^2.0.0"
+
 iconv-lite@0.4.19:
   version "0.4.19"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.19.tgz#f7468f60135f5e5dad3399c0a81be9a1603a082b"
@@ -4987,19 +5992,14 @@ iconv-lite@0.4.24, iconv-lite@^0.4.17, iconv-lite@^0.4.24, iconv-lite@^0.4.4, ic
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
-icss-replace-symbols@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded"
-  integrity sha1-Bupvg2ead0njhs/h/oEq5dsiPe0=
-
-icss-utils@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-2.1.0.tgz#83f0a0ec378bf3246178b6c2ad9136f135b1c962"
-  integrity sha1-g/Cg7DeL8yRheLbCrZE28TWxyWI=
+icss-utils@^4.0.0, icss-utils@^4.1.1:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/icss-utils/-/icss-utils-4.1.1.tgz#21170b53789ee27447c2f47dd683081403f9a467"
+  integrity sha512-4aFq7wvWyMHKgxsH8QQtGpvbASCf+eM3wPRLI6R+MgAnTCZ6STYsRvttLvRWK0Nfif5piF394St3HeJDaljGPA==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.14"
 
-ieee754@^1.1.11, ieee754@^1.1.4:
+ieee754@^1.1.4:
   version "1.1.12"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.12.tgz#50bf24e5b9c8bb98af4964c941cdb0918da7b60b"
   integrity sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==
@@ -5026,6 +6026,16 @@ ignore@^3.3.5:
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
   integrity sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==
 
+ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
+image-size@~0.5.0:
+  version "0.5.5"
+  resolved "https://registry.yarnpkg.com/image-size/-/image-size-0.5.5.tgz#09dfd4ab9d20e29eb1c3e80b8990378df9e3cb9c"
+  integrity sha1-Cd/Uq50g4p6xw+gLiZA3jfnjy5w=
+
 immediate@~3.0.5:
   version "3.0.6"
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
@@ -5046,6 +6056,14 @@ import-fresh@^2.0.0:
     caller-path "^2.0.0"
     resolve-from "^3.0.0"
 
+import-fresh@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.2.1.tgz#633ff618506e793af5ac91bf48b72677e15cbe66"
+  integrity sha512-6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ==
+  dependencies:
+    parent-module "^1.0.0"
+    resolve-from "^4.0.0"
+
 import-from@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/import-from/-/import-from-2.1.0.tgz#335db7f2a7affd53aaa471d4b8021dee36b7f3b1"
@@ -5058,15 +6076,7 @@ import-lazy@^2.1.0:
   resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-2.1.0.tgz#05698e3d45c88e8d7e9d92cb0584e77f096f3e43"
   integrity sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=
 
-import-local@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/import-local/-/import-local-1.0.0.tgz#5e4ffdc03f4fe6c009c6729beb29631c2f8227bc"
-  integrity sha512-vAaZHieK9qjGo58agRBg+bhHX3hoTZU/Oa3GESWLz7t1U62fk63aHuDJJEteXoDeTCcPmUT+z38gkHPZkkmpmQ==
-  dependencies:
-    pkg-dir "^2.0.0"
-    resolve-cwd "^2.0.0"
-
-import-local@^2.0.0:
+import-local@2.0.0, import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
   integrity sha512-b6s04m3O+s3CGSbqDIyP4R6aAwAeYlVq9+WUWep6iHa8ETRf9yei1U48C5MmfJmV9AiLYYBKPMq/W+/WRpQmCQ==
@@ -5099,6 +6109,11 @@ indent-string@^2.1.0:
   dependencies:
     repeating "^2.0.0"
 
+indent-string@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
+  integrity sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==
+
 indexes-of@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/indexes-of/-/indexes-of-1.0.1.tgz#f30f716c8e2bd346c7b67d3df3915566a7c05607"
@@ -5109,6 +6124,11 @@ indexof@0.0.1:
   resolved "https://registry.yarnpkg.com/indexof/-/indexof-0.0.1.tgz#82dc336d232b9062179d05ab3293a66059fd435d"
   integrity sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=
 
+infer-owner@^1.0.3, infer-owner@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/infer-owner/-/infer-owner-1.0.4.tgz#c4cefcaa8e51051c2a40ba2ce8a3d27295af9467"
+  integrity sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==
+
 inflight@^1.0.4:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
@@ -5117,7 +6137,7 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@2.0.3, inherits@^2.0.1, inherits@^2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@2.0.3, inherits@~2.0.0, inherits@~2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
@@ -5127,7 +6147,12 @@ inherits@2.0.1:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.1.tgz#b17d08d326b4423e568eff719f91b0b1cbdf69f1"
   integrity sha1-sX0I0ya0Qj5Wjv9xn5GwscvfafE=
 
-ini@^1.3.4, ini@~1.3.0:
+inherits@^2.0.1, inherits@^2.0.3:
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c"
+  integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==
+
+ini@1.3.5, ini@^1.3.4, ini@^1.3.5, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -5151,10 +6176,10 @@ inquirer@3.0.6:
     strip-ansi "^3.0.0"
     through "^2.3.6"
 
-inquirer@^6.0.0:
-  version "6.2.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.0.tgz#51adcd776f661369dc1e894859c2560a224abdd8"
-  integrity sha512-QIEQG4YyQ2UYZGDC4srMZ7BjHOmNk1lR2JQj5UknBapklm6WHA+VVH7N+sUdX3A7NeCfGF8o4X1S3Ao7nAcIeg==
+inquirer@6.2.1:
+  version "6.2.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-6.2.1.tgz#9943fc4882161bdb0b0c9276769c75b32dbfcd52"
+  integrity sha512-088kl3DRT2dLU5riVMKKr1DlImd6X7smDhpXUCkJDCKvTEJeRiXh0G132HG9u5a+6Ylw9plFRY7RuTnwohYSpg==
   dependencies:
     ansi-escapes "^3.0.0"
     chalk "^2.0.0"
@@ -5167,9 +6192,36 @@ inquirer@^6.0.0:
     run-async "^2.2.0"
     rxjs "^6.1.0"
     string-width "^2.1.0"
-    strip-ansi "^4.0.0"
+    strip-ansi "^5.0.0"
     through "^2.3.6"
 
+inquirer@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-7.0.1.tgz#13f7980eedc73c689feff3994b109c4e799c6ebb"
+  integrity sha512-V1FFQ3TIO15det8PijPLFR9M9baSlnRs9nL7zWu1MNVA2T9YVl9ZbrHJhYs7e9X8jeMZ3lr2JH/rdHFgNCBdYw==
+  dependencies:
+    ansi-escapes "^4.2.1"
+    chalk "^2.4.2"
+    cli-cursor "^3.1.0"
+    cli-width "^2.0.0"
+    external-editor "^3.0.3"
+    figures "^3.0.0"
+    lodash "^4.17.15"
+    mute-stream "0.0.8"
+    run-async "^2.2.0"
+    rxjs "^6.5.3"
+    string-width "^4.1.0"
+    strip-ansi "^5.1.0"
+    through "^2.3.6"
+
+internal-ip@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-3.0.1.tgz#df5c99876e1d2eb2ea2d74f520e3f669a00ece27"
+  integrity sha512-NXXgESC2nNVtU+pqmC9e6R8B1GpKxzsAQhffvh5AL79qKnodd+L7tnEQmTiUAVngqLalPbSqRA7XGIEL5nCd0Q==
+  dependencies:
+    default-gateway "^2.6.0"
+    ipaddr.js "^1.5.2"
+
 internal-ip@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/internal-ip/-/internal-ip-4.3.0.tgz#845452baad9d2ca3b69c635a137acb9a0dad0907"
@@ -5178,7 +6230,12 @@ internal-ip@^4.3.0:
     default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
-interpret@^1.0.0, interpret@^1.1.0:
+interpret@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296"
+  integrity sha512-mT34yGKMNceBQUoVn7iCDKDntA7SC6gycMAWzGx1z/CMCTV7b2AAtXlo3nRyHZ1FelRkQbQjprHSYGwzLtkVbw==
+
+interpret@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
   integrity sha1-ftGxQQxqDg94z5XTuEQMY/eLhhQ=
@@ -5205,7 +6262,7 @@ ip-regex@^2.1.0:
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
   integrity sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=
 
-ip@^1.1.0, ip@^1.1.5:
+ip@1.1.5, ip@^1.1.0, ip@^1.1.5:
   version "1.1.5"
   resolved "https://registry.yarnpkg.com/ip/-/ip-1.1.5.tgz#bdded70114290828c0a039e72ef25f5aaec4354a"
   integrity sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=
@@ -5220,7 +6277,7 @@ ipaddr.js@1.9.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.0.tgz#37df74e430a0e47550fe54a2defe30d8acd95f65"
   integrity sha512-M4Sjn6N/+O6/IXSJseKqHoFc+5FdGJ22sXqnjTpdZweHK64MzEPAyQZyEU3R/KRv2GLoa7nNtg/C2Ev6m7z+eA==
 
-ipaddr.js@^1.9.0:
+ipaddr.js@^1.5.2, ipaddr.js@^1.9.0:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
@@ -5392,6 +6449,11 @@ is-fullwidth-code-point@^2.0.0:
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
   integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=
 
+is-fullwidth-code-point@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d"
+  integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
+
 is-glob@^2.0.0, is-glob@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-2.0.1.tgz#d096f926a3ded5600f3fdfd91198cb0888c2d863"
@@ -5413,6 +6475,13 @@ is-glob@^4.0.0:
   dependencies:
     is-extglob "^2.1.1"
 
+is-glob@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"
+  integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg==
+  dependencies:
+    is-extglob "^2.1.1"
+
 is-installed-globally@^0.1.0:
   version "0.1.0"
   resolved "https://registry.yarnpkg.com/is-installed-globally/-/is-installed-globally-0.1.0.tgz#0dfd98f5a9111716dd535dda6492f67bf3d25a80"
@@ -5431,11 +6500,6 @@ is-npm@^1.0.0:
   resolved "https://registry.yarnpkg.com/is-npm/-/is-npm-1.0.0.tgz#f2fb63a65e4905b406c86072765a1a4dc793b9f4"
   integrity sha1-8vtjpl5JBbQGyGBydloaTceTufQ=
 
-is-number@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/is-number/-/is-number-0.1.1.tgz#69a7af116963d47206ec9bd9b48a14216f1e3806"
-  integrity sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=
-
 is-number@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-2.1.0.tgz#01fcbbb393463a548f2f466cce16dece49db908f"
@@ -5576,7 +6640,7 @@ is-utf8@^0.2.0:
   resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
   integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
 
-is-windows@^1.0.2:
+is-windows@^1.0.1, is-windows@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
   integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
@@ -5683,23 +6747,16 @@ istanbul@0.4.5, istanbul@^0.4.0, istanbul@^0.4.3:
     which "^1.1.1"
     wordwrap "^1.0.0"
 
-jasmine-core@^3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.2.1.tgz#8e4ff5b861603ee83343f2b49eee6a0ffe9650ce"
-  integrity sha512-pa9tbBWgU0EE4SWgc85T4sa886ufuQdsgruQANhECYjwqgV4z7Vw/499aCaP8ZH79JDS4vhm8doDG9HO4+e4sA==
+jasmine-core@^3.3, jasmine-core@^3.3.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.5.0.tgz#132c23e645af96d85c8bca13c8758b18429fc1e4"
+  integrity sha512-nCeAiw37MIMA9w9IXso7bRaLl+c/ef3wnxsoSAlYrzS+Ot0zTG6nU8G/cIfGkqpkjX2wNaIW9RFG0TwIFnG6bA==
 
 jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
   integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
-jasmine-diff@^0.1.3:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/jasmine-diff/-/jasmine-diff-0.1.3.tgz#93ccc2dcc41028c5ddd4606558074839f2deeaa8"
-  integrity sha1-k8zC3MQQKMXd1GBlWAdIOfLe6qg=
-  dependencies:
-    diff "^3.2.0"
-
 jasmine-marbles@0.3.1:
   version "0.3.1"
   resolved "https://registry.yarnpkg.com/jasmine-marbles/-/jasmine-marbles-0.3.1.tgz#ef65edecb41b8dd62fc6bda40448222042e32043"
@@ -5735,6 +6792,14 @@ jest-worker@^23.2.0:
   dependencies:
     merge-stream "^1.0.1"
 
+jest-worker@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-24.9.0.tgz#5dbfdb5b2d322e98567898238a9697bcce67b3e5"
+  integrity sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==
+  dependencies:
+    merge-stream "^2.0.0"
+    supports-color "^6.1.0"
+
 js-base64@^2.1.8:
   version "2.4.9"
   resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.9.tgz#748911fb04f48a60c4771b375cac45a80df11c03"
@@ -5755,7 +6820,7 @@ js-tokens@^3.0.2:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
   integrity sha1-mGbfOVECEw449/mWvOtlRDIJwls=
 
-js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.6.1, js-yaml@^3.7.0, js-yaml@^3.9.0:
+js-yaml@3.x, js-yaml@^3.12.0, js-yaml@^3.13.1, js-yaml@^3.6.1, js-yaml@^3.7.0:
   version "3.13.1"
   resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
   integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
@@ -5783,7 +6848,7 @@ jsesc@~0.5.0:
   resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d"
   integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0=
 
-json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
+json-parse-better-errors@^1.0.0, json-parse-better-errors@^1.0.1, json-parse-better-errors@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz#bb867cfb3450e69107c131d1c514bab3dc8bcaa9"
   integrity sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw==
@@ -5803,6 +6868,11 @@ json-schema@0.2.3:
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
   integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
 json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -5821,6 +6891,7 @@ json5@^0.5.0:
 json5@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/json5/-/json5-1.0.1.tgz#779fb0018604fa854eacbf6252180d83543e3dbe"
+  integrity sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==
   dependencies:
     minimist "^1.2.0"
 
@@ -5850,6 +6921,11 @@ jsonify@~0.0.0:
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
   integrity sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=
 
+jsonparse@^1.2.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
+  integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
+
 jsonschema@1.2.2:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/jsonschema/-/jsonschema-1.2.2.tgz#83ab9c63d65bf4d596f91d81195e78772f6452bc"
@@ -5889,12 +6965,12 @@ karma-chrome-launcher@2.2.0:
     fs-access "^1.0.0"
     which "^1.2.1"
 
-karma-cli@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/karma-cli/-/karma-cli-1.0.1.tgz#ae6c3c58a313a1d00b45164c455b9b86ce17f960"
-  integrity sha1-rmw8WKMTodALRRZMRVubhs4X+WA=
+karma-cli@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/karma-cli/-/karma-cli-2.0.0.tgz#481548d28661af4cc68f3d8e09708f17d2cba931"
+  integrity sha512-1Kb28UILg1ZsfqQmeELbPzuEb5C6GZJfVIk0qOr8LNYQuYWmAaqP16WpbpKEjhejDrDYyYOwwJXSZO6u7q5Pvw==
   dependencies:
-    resolve "^1.1.6"
+    resolve "^1.3.3"
 
 karma-coverage@1.1.2:
   version "1.1.2"
@@ -5914,10 +6990,12 @@ karma-istanbul-preprocessor@0.0.2:
   dependencies:
     istanbul "^0.4.3"
 
-karma-jasmine@1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-1.1.2.tgz#394f2b25ffb4a644b9ada6f22d443e2fd08886c3"
-  integrity sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=
+karma-jasmine@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/karma-jasmine/-/karma-jasmine-2.0.1.tgz#26e3e31f2faf272dd80ebb0e1898914cc3a19763"
+  integrity sha512-iuC0hmr9b+SNn1DaUD2QEYtUxkS1J+bSJSn7ejdEexs7P8EYvA1CWkEdrDQ+8jVH3AgWlCNwjYsT1chjcNW9lA==
+  dependencies:
+    jasmine-core "^3.3"
 
 karma-mocha-reporter@2.2.5:
   version "2.2.5"
@@ -5951,6 +7029,13 @@ karma-remap-istanbul@0.6.0:
     istanbul "^0.4.3"
     remap-istanbul "^0.9.0"
 
+karma-source-map-support@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/karma-source-map-support/-/karma-source-map-support-1.3.0.tgz#36dd4d8ca154b62ace95696236fae37caf0a7dde"
+  integrity sha512-HcPqdAusNez/ywa+biN4EphGz62MmQyPggUsDfsHqa7tSe4jdsxgvTKuDfIazjL+IOxpVWyT7Pr4dhAV+sxX5Q==
+  dependencies:
+    source-map-support "^0.5.5"
+
 karma-sourcemap-loader@0.3.7:
   version "0.3.7"
   resolved "https://registry.yarnpkg.com/karma-sourcemap-loader/-/karma-sourcemap-loader-0.3.7.tgz#91322c77f8f13d46fed062b042e1009d4c4505d8"
@@ -5977,27 +7062,27 @@ karma-webpack@3.0.0:
     source-map "^0.5.6"
     webpack-dev-middleware "^2.0.6"
 
-karma@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-3.0.0.tgz#6da83461a8a28d8224575c3b5b874e271b4730c3"
-  integrity sha512-ZTjyuDXVXhXsvJ1E4CnZzbCjSxD6sEdzEsFYogLuZM0yqvg/mgz+O+R1jb0J7uAQeuzdY8kJgx6hSNXLwFuHIQ==
+karma@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-4.0.1.tgz#2581d6caa0d4cd28b65131561b47bad6d5478773"
+  integrity sha512-ind+4s03BqIXas7ZmraV3/kc5+mnqwCd+VDX1FndS6jxbt03kQKX2vXrWxNLuCjVYmhMwOZosAEKMM0a2q7w7A==
   dependencies:
     bluebird "^3.3.0"
     body-parser "^1.16.1"
+    braces "^2.3.2"
     chokidar "^2.0.3"
     colors "^1.1.0"
-    combine-lists "^1.0.0"
     connect "^3.6.0"
     core-js "^2.2.0"
     di "^0.0.1"
     dom-serialize "^2.2.0"
-    expand-braces "^0.1.1"
+    flatted "^2.0.0"
     glob "^7.1.1"
     graceful-fs "^4.1.2"
     http-proxy "^1.13.0"
     isbinaryfile "^3.0.0"
-    lodash "^4.17.4"
-    log4js "^3.0.0"
+    lodash "^4.17.11"
+    log4js "^4.0.0"
     mime "^2.3.1"
     minimatch "^3.0.2"
     optimist "^0.6.1"
@@ -6008,14 +7093,14 @@ karma@3.0.0:
     socket.io "2.1.1"
     source-map "^0.6.1"
     tmp "0.0.33"
-    useragent "2.2.1"
+    useragent "2.3.0"
 
 kew@^0.7.0:
   version "0.7.0"
   resolved "https://registry.yarnpkg.com/kew/-/kew-0.7.0.tgz#79d93d2d33363d6fdd2970b335d9141ad591d79b"
   integrity sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=
 
-killable@^1.0.1:
+killable@^1.0.0, killable@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/killable/-/killable-1.0.1.tgz#4c8ce441187a061c7474fb87ca08e2a638194892"
   integrity sha512-LzqtLKlUwirEUyl/nicirVmNiPvYs7l5n8wOPP7fyJVpUPkvCnW/vuiXGpylGUlnPDnB7311rARzAt3Mhswpjg==
@@ -6097,7 +7182,32 @@ lcov-parse@^0.0.10:
   resolved "https://registry.yarnpkg.com/lcov-parse/-/lcov-parse-0.0.10.tgz#1b0b8ff9ac9c7889250582b70b71315d9da6d9a3"
   integrity sha1-GwuP+ayceIklBYK3C3ExXZ2m2aM=
 
-levn@~0.3.0:
+less-loader@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-4.1.0.tgz#2c1352c5b09a4f84101490274fd51674de41363e"
+  integrity sha512-KNTsgCE9tMOM70+ddxp9yyt9iHqgmSs0yTZc5XH5Wo+g80RWRIYNqE58QJKm/yMud5wZEvz50ugRDuzVIkyahg==
+  dependencies:
+    clone "^2.1.1"
+    loader-utils "^1.1.0"
+    pify "^3.0.0"
+
+less@3.9.0:
+  version "3.9.0"
+  resolved "https://registry.yarnpkg.com/less/-/less-3.9.0.tgz#b7511c43f37cf57dc87dffd9883ec121289b1474"
+  integrity sha512-31CmtPEZraNUtuUREYjSqRkeETFdyEHSEPAGq4erDlUXtda7pzNmctdljdIagSb589d/qXGWiiP31R5JVf+v0w==
+  dependencies:
+    clone "^2.1.2"
+  optionalDependencies:
+    errno "^0.1.1"
+    graceful-fs "^4.1.2"
+    image-size "~0.5.0"
+    mime "^1.4.1"
+    mkdirp "^0.5.0"
+    promise "^7.1.1"
+    request "^2.83.0"
+    source-map "~0.6.0"
+
+levn@^0.3.0, levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
   integrity sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=
@@ -6105,6 +7215,14 @@ levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
+license-webpack-plugin@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.1.0.tgz#83acaa6e89c3c5316effdd80cb4ec9c5cd8efc2f"
+  integrity sha512-vDiBeMWxjE9n6TabQ9J4FH8urFdsRK0Nvxn1cit9biCiR9aq1zBR0X2BlAkEiIG6qPamLeU0GzvIgLkrFc398A==
+  dependencies:
+    "@types/webpack-sources" "^0.1.5"
+    webpack-sources "^1.2.0"
+
 lie@~3.1.0:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/lie/-/lie-3.1.1.tgz#9a436b2cc7746ca59de7a41fa469b3efb76bd87e"
@@ -6123,6 +7241,16 @@ load-json-file@^1.0.0:
     pinkie-promise "^2.0.0"
     strip-bom "^2.0.0"
 
+load-json-file@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-2.0.0.tgz#7947e42149af80d696cbf797bcaabcfe1fe29ca8"
+  integrity sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=
+  dependencies:
+    graceful-fs "^4.1.2"
+    parse-json "^2.2.0"
+    pify "^2.0.0"
+    strip-bom "^3.0.0"
+
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -6138,6 +7266,20 @@ loader-runner@^2.3.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.3.0.tgz#f482aea82d543e07921700d5a46ef26fdac6b8a2"
   integrity sha1-9IKuqC1UPgeSFwDVpG7yb9rGuKI=
 
+loader-runner@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357"
+  integrity sha512-Jsmr89RcXGIwivFY21FcRrisYZfvLMTWx5kOLc+JTxtpBOG6xML0vzbc6SEQG2FO9/4Fc3wW4LVcB5DmGflaRw==
+
+loader-utils@1.2.3, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.0.4, loader-utils@^1.1.0, loader-utils@^1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
+  integrity sha512-fkpz8ejdnEMG3s37wGL07iSBDg99O9D5yflE9RGNH3hRdx9SOwYfnGYdZOUIZitN8E+E2vkq3MUMYMvPYl5ZZA==
+  dependencies:
+    big.js "^5.2.2"
+    emojis-list "^2.0.0"
+    json5 "^1.0.1"
+
 loader-utils@^0.2.12, loader-utils@^0.2.15, loader-utils@^0.2.16:
   version "0.2.17"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-0.2.17.tgz#f86e6374d43205a6e6c60e9196f17c0299bfb348"
@@ -6148,7 +7290,7 @@ loader-utils@^0.2.12, loader-utils@^0.2.15, loader-utils@^0.2.16:
     json5 "^0.5.0"
     object-assign "^4.0.1"
 
-loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1.0:
+loader-utils@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.1.0.tgz#c98aef488bcceda2ffb5e2de646d6a754429f5cd"
   integrity sha1-yYrvSIvM7aL/teLeZG1qdUQp9c0=
@@ -6157,14 +7299,6 @@ loader-utils@^1.0.0, loader-utils@^1.0.1, loader-utils@^1.0.2, loader-utils@^1.1
     emojis-list "^2.0.0"
     json5 "^0.5.0"
 
-loader-utils@^1.0.4:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-1.2.3.tgz#1ff5dc6911c9f0a062531a4c04b609406108c2c7"
-  dependencies:
-    big.js "^5.2.2"
-    emojis-list "^2.0.0"
-    json5 "^1.0.1"
-
 locate-path@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"
@@ -6181,13 +7315,12 @@ locate-path@^3.0.0:
     p-locate "^3.0.0"
     path-exists "^3.0.0"
 
-lodash._baseassign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
-  integrity sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=
+locate-path@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-5.0.0.tgz#1afba396afd676a6d42504d0a67a3a7eb9f62aa0"
+  integrity sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==
   dependencies:
-    lodash._basecopy "^3.0.0"
-    lodash.keys "^3.0.0"
+    p-locate "^4.1.0"
 
 lodash._basecopy@^3.0.0:
   version "3.0.1"
@@ -6204,20 +7337,6 @@ lodash._basevalues@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz#5b775762802bde3d3297503e26300820fdf661b7"
   integrity sha1-W3dXYoAr3j0yl1A+JjAIIP32Ybc=
 
-lodash._bindcallback@^3.0.0:
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz#e531c27644cf8b57a99e17ed95b35c748789392e"
-  integrity sha1-5THCdkTPi1epnhftlbNcdIeJOS4=
-
-lodash._createassigner@^3.0.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz#838a5bae2fdaca63ac22dee8e19fa4e6d6970b11"
-  integrity sha1-g4pbri/aymOsIt7o4Z+k5taXCxE=
-  dependencies:
-    lodash._bindcallback "^3.0.0"
-    lodash._isiterateecall "^3.0.0"
-    lodash.restparam "^3.0.0"
-
 lodash._getnative@^3.0.0:
   version "3.9.1"
   resolved "https://registry.yarnpkg.com/lodash._getnative/-/lodash._getnative-3.9.1.tgz#570bc7dede46d61cdcde687d65d3eecbaa3aaff5"
@@ -6248,26 +7367,12 @@ lodash._root@^3.0.0:
   resolved "https://registry.yarnpkg.com/lodash._root/-/lodash._root-3.0.1.tgz#fba1c4524c19ee9a5f8136b4609f017cf4ded692"
   integrity sha1-+6HEUkwZ7ppfgTa0YJ8BfPTe1pI=
 
-lodash.assign@^3.0.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-3.2.0.tgz#3ce9f0234b4b2223e296b8fa0ac1fee8ebca64fa"
-  integrity sha1-POnwI0tLIiPilrj6CsH+6OvKZPo=
-  dependencies:
-    lodash._baseassign "^3.0.0"
-    lodash._createassigner "^3.0.0"
-    lodash.keys "^3.0.0"
-
-lodash.assign@^4.0.1, lodash.assign@^4.2.0:
+lodash.assign@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
   integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
-lodash.camelcase@^4.3.0:
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
-  integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY=
-
-lodash.clonedeep@^4.3.2:
+lodash.clonedeep@^4.3.2, lodash.clonedeep@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
   integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
@@ -6277,15 +7382,7 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.defaults@^3.1.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-3.1.2.tgz#c7308b18dbf8bc9372d701a73493c61192bd2e2c"
-  integrity sha1-xzCLGNv4vJNy1wGnNJPGEZK9Liw=
-  dependencies:
-    lodash.assign "^3.0.0"
-    lodash.restparam "^3.0.0"
-
-lodash.defaults@^4.0.0, lodash.defaults@^4.2.0:
+lodash.defaults@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
   integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
@@ -6312,11 +7409,6 @@ lodash.flatten@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
   integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
 
-lodash.get@^4.4.2:
-  version "4.4.2"
-  resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
-  integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
-
 lodash.isarguments@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz#2f573d85c6a24289ff00663b491c1d338ff3458a"
@@ -6414,6 +7506,11 @@ lodash.templatesettings@^4.0.0:
   dependencies:
     lodash._reinterpolate "^3.0.0"
 
+lodash.unescape@4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/lodash.unescape/-/lodash.unescape-4.0.1.tgz#bf2249886ce514cda112fae9218cdc065211fc9c"
+  integrity sha1-vyJJiGzlFM2hEvrpIYzcBlIR/Jw=
+
 lodash.union@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.union/-/lodash.union-4.6.0.tgz#48bb5088409f16f1821666641c44dd1aaae3cd88"
@@ -6424,7 +7521,7 @@ lodash.uniq@^4.5.0:
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.10:
+lodash@^4.0.0, lodash@^4.0.1, lodash@^4.13.1, lodash@^4.17.0, lodash@^4.17.10, lodash@^4.17.11, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@^4.17.5, lodash@^4.3.0, lodash@^4.5.0, lodash@~4.17.10:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
@@ -6441,16 +7538,21 @@ log-symbols@^2.0.0, log-symbols@^2.1.0:
   dependencies:
     chalk "^2.0.1"
 
-log4js@^3.0.0:
-  version "3.0.5"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-3.0.5.tgz#b80146bfebad68b430d4f3569556d8a6edfef303"
-  integrity sha512-IX5c3G/7fuTtdr0JjOT2OIR12aTESVhsH6cEsijloYwKgcPRlO6DgOU72v0UFhWcoV1HN6+M3dwT89qVPLXm0w==
+log4js@^4.0.0:
+  version "4.5.1"
+  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
+  integrity sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==
   dependencies:
-    circular-json "^0.5.5"
-    date-format "^1.2.0"
-    debug "^3.1.0"
-    rfdc "^1.1.2"
-    streamroller "0.7.0"
+    date-format "^2.0.0"
+    debug "^4.1.1"
+    flatted "^2.0.0"
+    rfdc "^1.1.4"
+    streamroller "^1.0.6"
+
+loglevel@^1.4.1:
+  version "1.6.6"
+  resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.6.tgz#0ee6300cc058db6b3551fa1c4bf73b83bb771312"
+  integrity sha512-Sgr5lbboAUBo3eXCSPL4/KoVz3ROKquOjcctxmHIt+vol2DrqTQe3SwkKKuYhEiWB5kYa13YyopJ69deJ1irzQ==
 
 loglevel@^1.6.3:
   version "1.6.3"
@@ -6465,16 +7567,6 @@ loglevelnext@^1.0.1:
     es6-symbol "^3.1.1"
     object.assign "^4.1.0"
 
-long@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
-  integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
-
-long@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/long/-/long-3.2.0.tgz#d821b7138ca1cb581c172990ef14db200b5c474b"
-  integrity sha1-2CG3E4yhy1gcFymQ7xTbIAtcR0s=
-
 loose-envify@^1.0.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf"
@@ -6500,10 +7592,13 @@ lowercase-keys@^1.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-1.0.1.tgz#6f9e30b47084d971a7c820ff15a6c5167b74c26f"
   integrity sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==
 
-lru-cache@2.2.x:
-  version "2.2.4"
-  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-2.2.4.tgz#6c658619becf14031d0d0b594b16042ce4dc063d"
-  integrity sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=
+lru-cache@4.1.x:
+  version "4.1.5"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-4.1.5.tgz#8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"
+  integrity sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==
+  dependencies:
+    pseudomap "^1.0.2"
+    yallist "^2.1.2"
 
 lru-cache@^4.0.1, lru-cache@^4.1.1:
   version "4.1.3"
@@ -6513,6 +7608,13 @@ lru-cache@^4.0.1, lru-cache@^4.1.1:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
 
+lru-cache@^5.1.1:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-5.1.1.tgz#1da27e6710271947695daf6848e847f01d84b920"
+  integrity sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==
+  dependencies:
+    yallist "^3.0.2"
+
 magic-string@^0.22.4:
   version "0.22.5"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.22.5.tgz#8e9cf5afddf44385c1da5bc2a6a0dbd10b03657e"
@@ -6520,6 +7622,13 @@ magic-string@^0.22.4:
   dependencies:
     vlq "^0.2.2"
 
+magic-string@^0.25.0:
+  version "0.25.4"
+  resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.4.tgz#325b8a0a79fc423db109b77fd5a19183b7ba5143"
+  integrity sha512-oycWO9nEVAP2RVPbIoDoA4Y7LFIJ3xRYov93gAyJhZkET1tNuB0u7uWkZS2LpBWTJUWnmau/To8ECWRC+jKNfw==
+  dependencies:
+    sourcemap-codec "^1.4.4"
+
 make-dir@^1.0.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-1.3.0.tgz#79c1033b80515bd6d24ec9933e860ca75ee27f0c"
@@ -6527,11 +7636,43 @@ make-dir@^1.0.0:
   dependencies:
     pify "^3.0.0"
 
+make-dir@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
+  integrity sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==
+  dependencies:
+    pify "^4.0.1"
+    semver "^5.6.0"
+
+make-dir@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.0.tgz#1b5f39f6b9270ed33f9f054c5c0f84304989f801"
+  integrity sha512-grNJDhb8b1Jm1qeqW5R/O63wUo4UXo2v2HMic6YT9i/HBlF93S8jkMgH7yugvY9ABDShH4VZMn8I+U8+fCNegw==
+  dependencies:
+    semver "^6.0.0"
+
 make-error@^1.1.1:
   version "1.3.4"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.4.tgz#19978ed575f9e9545d2ff8c13e33b5d18a67d535"
   integrity sha512-0Dab5btKVPhibSalc9QGXb559ED7G7iLjFXBaj9Wq8O3vorueR5K5jaE3hkG6ZQINyhA/JgG6Qk4qdFQjsYV6g==
 
+make-fetch-happen@^4.0.1, make-fetch-happen@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-4.0.2.tgz#2d156b11696fb32bffbafe1ac1bc085dd6c78a79"
+  integrity sha512-YMJrAjHSb/BordlsDEcVcPyTbiJKkzqMf48N8dAJZT9Zjctrkb6Yg4TY9Sq2AwSIQJFn5qBBKVTYt3vP5FMIHA==
+  dependencies:
+    agentkeepalive "^3.4.1"
+    cacache "^11.3.3"
+    http-cache-semantics "^3.8.1"
+    http-proxy-agent "^2.1.0"
+    https-proxy-agent "^2.2.1"
+    lru-cache "^5.1.1"
+    mississippi "^3.0.0"
+    node-fetch-npm "^2.0.2"
+    promise-retry "^1.1.1"
+    socks-proxy-agent "^4.0.0"
+    ssri "^6.0.0"
+
 mamacro@^0.0.3:
   version "0.0.3"
   resolved "https://registry.yarnpkg.com/mamacro/-/mamacro-0.0.3.tgz#ad2c9576197c9f1abf308d0787865bd975a3f3e4"
@@ -6608,6 +7749,13 @@ media-typer@0.3.0:
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
+mem@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-1.1.0.tgz#5edd52b485ca1d900fe64895505399a0dfa45f76"
+  integrity sha1-Xt1StIXKHZAP5kiVUFOZoN+kX3Y=
+  dependencies:
+    mimic-fn "^1.0.0"
+
 mem@^4.0.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz#461af497bc4ae09608cdb2e60eefb69bff744178"
@@ -6658,6 +7806,11 @@ merge-stream@^1.0.1:
   dependencies:
     readable-stream "^2.0.1"
 
+merge-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-2.0.0.tgz#52823629a14dd00c9770fb6ad47dc6310f2c1f60"
+  integrity sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==
+
 merge2@^1.2.1:
   version "1.2.2"
   resolved "https://registry.yarnpkg.com/merge2/-/merge2-1.2.2.tgz#03212e3da8d86c4d8523cebd6318193414f94e34"
@@ -6673,7 +7826,7 @@ methods@1.1.2, methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micromatch@^2.1.5, micromatch@^2.3.11:
+micromatch@^2.3.11:
   version "2.3.11"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-2.3.11.tgz#86677c97d1720b363431d04d0d15293bd38c1565"
   integrity sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=
@@ -6692,7 +7845,7 @@ micromatch@^2.1.5, micromatch@^2.3.11:
     parse-glob "^3.0.4"
     regex-cache "^0.4.2"
 
-micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8:
+micromatch@^3.0.4, micromatch@^3.1.10, micromatch@^3.1.4, micromatch@^3.1.8, micromatch@^3.1.9:
   version "3.1.10"
   resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-3.1.10.tgz#70859bc95c9840952f359a068a3fc49f9ecfac23"
   integrity sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==
@@ -6748,7 +7901,7 @@ mime@1.4.1:
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.4.1.tgz#121f9ebc49e3766f311a76e1fa1c8003c4b03aa6"
   integrity sha512-KI1+qOZu5DcW6wayYHSzR/tXKCDC5Om4s1z2QJjDULzLcmf3DvzS7oluY4HCTrc+9FiKmWUgeNLg7W3uIQvxtQ==
 
-mime@1.6.0, mime@^1.6.0:
+mime@1.6.0, mime@^1.4.1, mime@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/mime/-/mime-1.6.0.tgz#32cd9e5c64553bd58d19a568af452acff04981b1"
   integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
@@ -6768,11 +7921,20 @@ mimic-fn@^1.0.0:
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.2.0.tgz#820c86a39334640e99516928bd03fca88057d022"
   integrity sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==
 
-mimic-fn@^2.0.0:
+mimic-fn@^2.0.0, mimic-fn@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
   integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==
 
+mini-css-extract-plugin@0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
+  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
+    webpack-sources "^1.1.0"
+
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
@@ -6810,6 +7972,27 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha1-3j+YVD2/lggr5IrRoMfNqDYwHc8=
 
+minipass-collect@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/minipass-collect/-/minipass-collect-1.0.2.tgz#22b813bf745dc6edba2576b940022ad6edc8c617"
+  integrity sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-flush@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/minipass-flush/-/minipass-flush-1.0.5.tgz#82e7135d7e89a50ffe64610a787953c4c4cbb373"
+  integrity sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==
+  dependencies:
+    minipass "^3.0.0"
+
+minipass-pipeline@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz#3dcb6bb4a546e32969c7ad710f2c79a86abba93a"
+  integrity sha512-3JS5A2DKhD2g0Gg8x3yamO0pj7YeKGwVlDS90pF++kxptwx/F+B//roxf9SqYil5tQo65bijy+dAuAFZmYOouA==
+  dependencies:
+    minipass "^3.0.0"
+
 minipass@^2.2.1, minipass@^2.3.3:
   version "2.3.4"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.3.4.tgz#4768d7605ed6194d6d576169b9e12ef71e9d9957"
@@ -6818,6 +8001,21 @@ minipass@^2.2.1, minipass@^2.3.3:
     safe-buffer "^5.1.2"
     yallist "^3.0.0"
 
+minipass@^2.3.5, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
+minipass@^3.0.0, minipass@^3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
+  integrity sha512-UFqVihv6PQgwj8/yTGvl9kPz7xIAY+R5z6XYjRInD3Gk3qx6QGSD6zEcpeG4Dy/lQnv1J6zv8ejV90hyYIKf3w==
+  dependencies:
+    yallist "^4.0.0"
+
 minizlib@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.1.0.tgz#11e13658ce46bc3a70a267aac58359d1e0c29ceb"
@@ -6825,6 +8023,13 @@ minizlib@^1.1.0:
   dependencies:
     minipass "^2.2.1"
 
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+  dependencies:
+    minipass "^2.9.0"
+
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
@@ -6841,6 +8046,22 @@ mississippi@^2.0.0:
     stream-each "^1.1.0"
     through2 "^2.0.0"
 
+mississippi@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-3.0.0.tgz#ea0a3291f97e0b5e8776b363d5f0a12d94c67022"
+  integrity sha512-x471SsVjUtBRtcvd4BzKE9kFC+/2TeWgKCgw0bZcw1b9l2X3QX5vCWgF+KaZaYm87Ss//rHnWryupDrgLvmSkA==
+  dependencies:
+    concat-stream "^1.5.0"
+    duplexify "^3.4.2"
+    end-of-stream "^1.1.0"
+    flush-write-stream "^1.0.0"
+    from2 "^2.1.0"
+    parallel-transform "^1.1.0"
+    pump "^3.0.0"
+    pumpify "^1.3.3"
+    stream-each "^1.1.0"
+    through2 "^2.0.0"
+
 mixin-deep@^1.2.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/mixin-deep/-/mixin-deep-1.3.2.tgz#1120b43dc359a785dce65b55b82e257ccf479566"
@@ -6881,6 +8102,13 @@ mocha@^5.2.0:
     mkdirp "0.5.1"
     supports-color "5.4.0"
 
+moment-range@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/moment-range/-/moment-range-4.0.2.tgz#f7c3863df2a1ed7fd1822ba5a7bcf53a78701be9"
+  integrity sha512-n8sceWwSTjmz++nFHzeNEUsYtDqjgXgcOBzsHi+BoXQU2FW+eU92LUaK8gqOiSu5PG57Q9sYj1Fz4LRDj4FtKA==
+  dependencies:
+    es6-symbol "^3.1.0"
+
 moment@^2.22.1:
   version "2.22.2"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66"
@@ -6919,7 +8147,7 @@ ms@2.1.1:
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a"
   integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==
 
-ms@^2.1.1:
+ms@^2.0.0, ms@^2.1.1:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009"
   integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==
@@ -6949,12 +8177,17 @@ mute-stream@0.0.7:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.7.tgz#3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"
   integrity sha1-MHXOk7whuPq0PhvE2n6BFe0ee6s=
 
+mute-stream@0.0.8:
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d"
+  integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==
+
 nan@^2.10.0, nan@^2.9.2:
   version "2.11.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.11.0.tgz#574e360e4d954ab16966ec102c0c049fd961a099"
   integrity sha512-F4miItu2rGnV2ySkXOQoA8FKz/SR2Q2sWP0sbTxNxz/tuokeC8WxOhPMcwi0qIyGtVn/rrSeLbvVkznqCdwYnw==
 
-nan@^2.12.1:
+nan@^2.12.1, nan@^2.13.2:
   version "2.14.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz#7818f722027b2459a86f0295d434d1fc2336c52c"
   integrity sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg==
@@ -6976,6 +8209,11 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
 ncp@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ncp/-/ncp-2.0.0.tgz#195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"
@@ -7000,30 +8238,30 @@ negotiator@0.6.2:
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
 
-neo-async@^2.5.0, neo-async@^2.6.0:
+neo-async@^2.5.0, neo-async@^2.6.0, neo-async@^2.6.1:
   version "2.6.1"
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
-next-tick@1:
+next-tick@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
-ng-mocks@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-6.2.1.tgz#4655336de88eefec80032563b1ee968457d2dc9b"
-  integrity sha512-WLD6faE6maGeQoX72l06B83UyuOqwyuI9rjtuFbblIme74ASl815azdXucMN2I8APR9+f3CrtIu9XlWUPQLyFQ==
+ng-mocks@^7.6.0:
+  version "7.8.0"
+  resolved "https://registry.yarnpkg.com/ng-mocks/-/ng-mocks-7.8.0.tgz#05b9f46164ca8d22b72ee9ac2369f37b2434ceb2"
+  integrity sha512-QopwqQUeEoUmHZdJeEDG3koJ5woHYeVe3TEfRjVHwLyLfJ/wdcNcepdei6j9n9Ne42SpS2bOETgKBqUT5NUsng==
 
 ng2-file-upload@1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ng2-file-upload/-/ng2-file-upload-1.2.1.tgz#5563c5dfd6f43fbfbe815c206e343464a0a6a197"
   integrity sha1-VWPF39b0P7++gVwgbjQ0ZKCmoZc=
 
-ng2-nouislider@^1.7.11:
-  version "1.7.12"
-  resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.7.12.tgz#874640463bd464ce2eeb442bfd650259f90102e2"
-  integrity sha1-h0ZARjvUZM4u60Qr/WUCWfkBAuI=
+ng2-nouislider@^1.8.2:
+  version "1.8.2"
+  resolved "https://registry.yarnpkg.com/ng2-nouislider/-/ng2-nouislider-1.8.2.tgz#4d4aab402d307020415da1714a5e9f46817fe97c"
+  integrity sha512-apCpRxwX/3VapLuPozZkUfM3HAE1unuCm2UdRMDvAHbbY6CLobaZcsWUYQ6b02VzxccyV4G1z0xsq2un8J2Lqw==
 
 ngrx-store-freeze@^0.2.4:
   version "0.2.4"
@@ -7044,10 +8282,10 @@ ngx-infinite-scroll@6.0.1:
   dependencies:
     opencollective "^1.0.3"
 
-ngx-moment@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/ngx-moment/-/ngx-moment-3.1.0.tgz#41380b4dd8b68e7bd6d17cc6fe7f703ae506dc3a"
-  integrity sha512-liX6iTfOY0XyI3rUuWNgGpgxoeD+DFaAl7UJ/ejl9Ama5cXzw8L1Eft6UQLUo1d80kjNMc6AL+L19CPMvUQ/BA==
+ngx-moment@^3.4.0:
+  version "3.5.0"
+  resolved "https://registry.yarnpkg.com/ngx-moment/-/ngx-moment-3.5.0.tgz#97a4575a05d038612229b9fe09c4910353020613"
+  integrity sha512-QC/5XNC0BW6WkJkwZT4r2A29j/8sJAmhuQJrEnEdpW35GvkemccuxEUAwo/PwkzPB/CHaquR00E6P2HVEQ1iEg==
   dependencies:
     tslib "^1.9.0"
 
@@ -7068,6 +8306,15 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
+node-fetch-npm@^2.0.2:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/node-fetch-npm/-/node-fetch-npm-2.0.2.tgz#7258c9046182dca345b4208eda918daf33697ff7"
+  integrity sha512-nJIxm1QmAj4v3nfCvEeCrYSoVwXyxLnaPBK5W1W5DGEJwjlKuC2VEUycGw5oxk+4zZahRrB84PUJJgEmhFTDFw==
+  dependencies:
+    encoding "^0.1.11"
+    json-parse-better-errors "^1.0.0"
+    safe-buffer "^5.1.1"
+
 node-fetch@1.6.3:
   version "1.6.3"
   resolved "https://registry.npmjs.org/node-fetch/-/node-fetch-1.6.3.tgz#dc234edd6489982d58e8f0db4f695029abcd8c04"
@@ -7081,6 +8328,11 @@ node-forge@0.7.5:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.7.5.tgz#6c152c345ce11c52f465c2abd957e8639cd674df"
   integrity sha512-MmbQJ2MTESTjt3Gi/3yG1wGpIMhUfcIypUCGtTizFR9IiccFwxSpfp0vtIZlkFclEqERemxfnSdZEMR9VqqEFQ==
 
+node-forge@0.9.0:
+  version "0.9.0"
+  resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz#d624050edbb44874adca12bb9a52ec63cb782579"
+  integrity sha512-7ASaDa3pD+lJ3WvXFsxekJQelBKRpne+GOVbLbtHYdd7pFspyeuJHnWfLplGf3SwKGbfs/aYl5V/JCIaHVUKKQ==
+
 node-gyp@^3.8.0:
   version "3.8.0"
   resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-3.8.0.tgz#540304261c330e80d0d5edce253a68cb3964218c"
@@ -7128,6 +8380,35 @@ node-libs-browser@^2.0.0:
     util "^0.10.3"
     vm-browserify "0.0.4"
 
+node-libs-browser@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/node-libs-browser/-/node-libs-browser-2.2.1.tgz#b64f513d18338625f90346d27b0d235e631f6425"
+  integrity sha512-h/zcD8H9kaDZ9ALUWwlBUDo6TKF8a7qBSCSEGfjTVIYeqsioSKaAX+BN7NgiMGp6iSIXZ3PxgCu8KS3b71YK5Q==
+  dependencies:
+    assert "^1.1.1"
+    browserify-zlib "^0.2.0"
+    buffer "^4.3.0"
+    console-browserify "^1.1.0"
+    constants-browserify "^1.0.0"
+    crypto-browserify "^3.11.0"
+    domain-browser "^1.1.1"
+    events "^3.0.0"
+    https-browserify "^1.0.0"
+    os-browserify "^0.3.0"
+    path-browserify "0.0.1"
+    process "^0.11.10"
+    punycode "^1.2.4"
+    querystring-es3 "^0.2.0"
+    readable-stream "^2.3.3"
+    stream-browserify "^2.0.1"
+    stream-http "^2.7.2"
+    string_decoder "^1.0.0"
+    timers-browserify "^2.0.4"
+    tty-browserify "0.0.0"
+    url "^0.11.0"
+    util "^0.11.0"
+    vm-browserify "^1.0.1"
+
 node-pre-gyp@^0.10.0:
   version "0.10.3"
   resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.10.3.tgz#3070040716afdc778747b61b6887bf78880b80fc"
@@ -7167,6 +8448,13 @@ node-releases@^1.0.0-alpha.11:
   dependencies:
     semver "^5.3.0"
 
+node-releases@^1.1.42:
+  version "1.1.42"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.42.tgz#a999f6a62f8746981f6da90627a8d2fc090bbad7"
+  integrity sha512-OQ/ESmUqGawI2PRX+XIRao44qWYBBfN54ImQYdWVTQqUckuejOg76ysSqDBK8NG3zwySRVnX36JwDQ6x+9GxzA==
+  dependencies:
+    semver "^6.3.0"
+
 node-releases@^1.1.8:
   version "1.1.10"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.10.tgz#5dbeb6bc7f4e9c85b899e2e7adcc0635c9b2adf7"
@@ -7174,6 +8462,29 @@ node-releases@^1.1.8:
   dependencies:
     semver "^5.3.0"
 
+node-sass@4.12.0:
+  version "4.12.0"
+  resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.12.0.tgz#0914f531932380114a30cc5fa4fa63233a25f017"
+  integrity sha512-A1Iv4oN+Iel6EPv77/HddXErL2a+gZ4uBeZUy+a8O35CFYTXhgA8MgLCWBtwpGZdCvTvQ9d+bQxX/QC36GDPpQ==
+  dependencies:
+    async-foreach "^0.1.3"
+    chalk "^1.1.1"
+    cross-spawn "^3.0.0"
+    gaze "^1.0.0"
+    get-stdin "^4.0.1"
+    glob "^7.0.3"
+    in-publish "^2.0.0"
+    lodash "^4.17.11"
+    meow "^3.7.0"
+    mkdirp "^0.5.1"
+    nan "^2.13.2"
+    node-gyp "^3.8.0"
+    npmlog "^4.0.0"
+    request "^2.88.0"
+    sass-graph "^2.2.4"
+    stdout-stream "^1.4.0"
+    "true-case-path" "^1.0.2"
+
 node-sass@^4.11.0:
   version "4.11.0"
   resolved "https://registry.yarnpkg.com/node-sass/-/node-sass-4.11.0.tgz#183faec398e9cbe93ba43362e2768ca988a6369a"
@@ -7245,7 +8556,7 @@ nopt@~1.0.10:
   dependencies:
     abbrev "1"
 
-normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, "normalize-package-data@~1.0.1 || ^2.0.0":
+normalize-package-data@^2.3.2, normalize-package-data@^2.3.4:
   version "2.4.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.4.0.tgz#12f95a307d58352075a04907b84ac8be98ac012f"
   integrity sha512-9jjUFbTPfEy3R/ad/2oNbKtW9Hgovl5O1FvFWKkKblNXoN/Oou6+9+KKohPK13Yc3/TyunyWhJp6gvRNR/PPAw==
@@ -7255,7 +8566,17 @@ normalize-package-data@^2.3.2, normalize-package-data@^2.3.4, "normalize-package
     semver "2 || 3 || 4 || 5"
     validate-npm-package-license "^3.0.1"
 
-normalize-path@^2.0.0, normalize-path@^2.0.1, normalize-path@^2.1.1:
+normalize-package-data@^2.4.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
+  integrity sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==
+  dependencies:
+    hosted-git-info "^2.1.4"
+    resolve "^1.10.0"
+    semver "2 || 3 || 4 || 5"
+    validate-npm-package-license "^3.0.1"
+
+normalize-path@^2.0.1, normalize-path@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-2.1.1.tgz#1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"
   integrity sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=
@@ -7287,7 +8608,7 @@ npm-bundled@^1.0.1:
   resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.0.5.tgz#3c1732b7ba936b3a10325aef616467c0ccbcc979"
   integrity sha512-m/e6jgWu8/v5niCUKQi9qQl8QdeEduFA96xHDDzFGqly0OOjI7c+60KM/2sppfnUU9JJagf+zs+yGhqSOFj71g==
 
-"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0":
+npm-package-arg@6.1.0:
   version "6.1.0"
   resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.0.tgz#15ae1e2758a5027efb4c250554b85a737db7fcc1"
   integrity sha512-zYbhP2k9DbJhA0Z3HKUePUgdB1x7MfIfKssC+WLPFMKTBZKpZh5m13PgexJjCq6KW7j17r0jHWcCpxEqnnncSA==
@@ -7297,6 +8618,24 @@ npm-bundled@^1.0.1:
     semver "^5.5.0"
     validate-npm-package-name "^3.0.0"
 
+npm-package-arg@^6.0.0, npm-package-arg@^6.1.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
+  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
+  dependencies:
+    hosted-git-info "^2.7.1"
+    osenv "^0.1.5"
+    semver "^5.6.0"
+    validate-npm-package-name "^3.0.0"
+
+npm-packlist@^1.1.12:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.7.tgz#9e954365a06b80b18111ea900945af4f88ed4848"
+  integrity sha512-vAj7dIkp5NhieaGZxBJB8fF4R0078rqsmhJcAfXZ6O7JJhjhPK96n5Ry1oZcfLXgfun0GWTZPOxaEyqv8GBykQ==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+
 npm-packlist@^1.1.6:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.1.11.tgz#84e8c683cbe7867d34b1d357d893ce29e28a02de"
@@ -7305,24 +8644,26 @@ npm-packlist@^1.1.6:
     ignore-walk "^3.0.1"
     npm-bundled "^1.0.1"
 
-npm-registry-client@^8.5.1:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
-  integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==
+npm-pick-manifest@^2.2.3:
+  version "2.2.3"
+  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-2.2.3.tgz#32111d2a9562638bb2c8f2bf27f7f3092c8fae40"
+  integrity sha512-+IluBC5K201+gRU85vFlUwX3PFShZAbAgDNp2ewJdWMVSppdo/Zih0ul2Ecky/X7b51J7LrrUAP+XOmOCvYZqA==
   dependencies:
-    concat-stream "^1.5.2"
-    graceful-fs "^4.1.6"
-    normalize-package-data "~1.0.1 || ^2.0.0"
-    npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
-    once "^1.3.3"
-    request "^2.74.0"
-    retry "^0.10.0"
-    safe-buffer "^5.1.1"
-    semver "2 >=2.2.1 || 3.x || 4 || 5"
-    slide "^1.1.3"
-    ssri "^5.2.4"
-  optionalDependencies:
-    npmlog "2 || ^3.1.0 || ^4.0.0"
+    figgy-pudding "^3.5.1"
+    npm-package-arg "^6.0.0"
+    semver "^5.4.1"
+
+npm-registry-fetch@^3.8.0:
+  version "3.9.1"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-3.9.1.tgz#00ff6e4e35d3f75a172b332440b53e93f4cb67de"
+  integrity sha512-VQCEZlydXw4AwLROAXWUR7QDfe2Y8Id/vpAgp6TI1/H78a4SiQ1kQrKZALm5/zxM5n4HIi+aYb+idUAV/RuY0Q==
+  dependencies:
+    JSONStream "^1.3.4"
+    bluebird "^3.5.1"
+    figgy-pudding "^3.4.1"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^4.0.2"
+    npm-package-arg "^6.1.0"
 
 npm-run-all@4.1.3:
   version "4.1.3"
@@ -7346,7 +8687,7 @@ npm-run-path@^2.0.0, npm-run-path@^2.0.2:
   dependencies:
     path-key "^2.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", "npmlog@2 || ^3.1.0 || ^4.0.0", npmlog@^4.0.0, npmlog@^4.0.2:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -7419,11 +8760,6 @@ object-keys@^1.0.11, object-keys@^1.0.12:
   resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.12.tgz#09c53855377575310cca62f55bb334abff7b3ed2"
   integrity sha512-FTMyFUm2wBcGHnH2eXmz7tC6IwlqQZ6mVZ+6dm6vZ4IQIHjs6FdNsQBuKGPuUUUY6NfJw2PshC08Tn6LzLDOag==
 
-object-path@^0.9.2:
-  version "0.9.2"
-  resolved "https://registry.yarnpkg.com/object-path/-/object-path-0.9.2.tgz#0fd9a74fc5fad1ae3968b586bda5c632bd6c05a5"
-  integrity sha1-D9mnT8X60a45aLWGvaXGMr1sBaU=
-
 object-visit@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/object-visit/-/object-visit-1.0.1.tgz#f79c4493af0c5377b59fe39d395e41042dd045bb"
@@ -7496,7 +8832,7 @@ on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@1.x, once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
+once@1.x, once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -7515,6 +8851,20 @@ onetime@^2.0.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+onetime@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz#fff0f3c91617fe62bb50189636e99ac8a6df7be5"
+  integrity sha512-5NcSkPHhwTVFIQN+TUqXoS5+dlElHXdpAWu9I0HP20YOtIi+aZ0Ct82jdlILDxjLEAWwvm+qj1m6aEtsDVmm6Q==
+  dependencies:
+    mimic-fn "^2.1.0"
+
+open@6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.0.0.tgz#cae5e2c1a3a1bfaee0d0acc8c4b7609374750346"
+  integrity sha512-/yb5mVZBz7mHLySMiSj2DcLtMBbFPJk5JBKEkHVZFxZAPzeg3L026O0T+lbdz1B2nyDnkClRSwRQJdeVUIF7zw==
+  dependencies:
+    is-wsl "^1.1.0"
+
 opencollective@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/opencollective/-/opencollective-1.0.3.tgz#aee6372bc28144583690c3ca8daecfc120dd0ef1"
@@ -7545,14 +8895,7 @@ opn@4.0.2:
     object-assign "^4.0.1"
     pinkie-promise "^2.0.0"
 
-opn@^5.3.0:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/opn/-/opn-5.3.0.tgz#64871565c863875f052cfdf53d3e3cb5adb53b1c"
-  integrity sha512-bYJHo/LOmoTd+pfiYhfZDnf9zekVJrY+cnS2a5F2x+w5ppvTqObojTP7WiFG+kVZs9Inw+qQ/lw7TroWwhdd2g==
-  dependencies:
-    is-wsl "^1.1.0"
-
-opn@^5.5.0:
+opn@^5.1.0, opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
   integrity sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==
@@ -7587,6 +8930,18 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     wordwrap "~1.0.0"
 
+optionator@^0.8.3:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.8.3.tgz#84fa1d036fe9d3c7e21d99884b601167ec8fb495"
+  integrity sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==
+  dependencies:
+    deep-is "~0.1.3"
+    fast-levenshtein "~2.0.6"
+    levn "~0.3.0"
+    prelude-ls "~1.1.2"
+    type-check "~0.3.2"
+    word-wrap "~1.2.3"
+
 original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -7611,7 +8966,16 @@ os-locale@^1.4.0:
   dependencies:
     lcid "^1.0.0"
 
-os-locale@^3.0.0:
+os-locale@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-2.1.0.tgz#42bc2900a6b5b8bd17376c8e882b65afccf24bf2"
+  integrity sha512-3sslG3zJbEYcaC4YVAvDorjGxc7tv6KVATnLPZONiljsUncvihe9BQoVCEs0RZ1kmf4Hk9OBqlZfJZWI4GanKA==
+  dependencies:
+    execa "^0.7.0"
+    lcid "^1.0.0"
+    mem "^1.1.0"
+
+os-locale@^3.0.0, os-locale@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz#a802a6ee17f24c10483ab9935719cef4ed16bf1a"
   integrity sha512-Z8l3R4wYWM40/52Z+S265okfFj8Kt2cC2MKY+xNi3kFs+XGI7WXu/I309QQQYbRW4ijiZ+yxs9pqEhJh0DqW3Q==
@@ -7662,6 +9026,13 @@ p-limit@^2.0.0:
   dependencies:
     p-try "^2.0.0"
 
+p-limit@^2.2.0, p-limit@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.1.tgz#aa07a788cc3151c939b5131f63570f0dd2009537"
+  integrity sha512-85Tk+90UCVWvbDavCLKPOLC9vvY8OwEX/RtKF+/1OADJMVlFfEHOiMTPVyxg7mk/dKa+ipdHm0OUkTvCpMTuwg==
+  dependencies:
+    p-try "^2.0.0"
+
 p-locate@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-2.0.0.tgz#20a0103b222a70c8fd39cc2e580680f3dde5ec43"
@@ -7676,11 +9047,30 @@ p-locate@^3.0.0:
   dependencies:
     p-limit "^2.0.0"
 
+p-locate@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-4.1.0.tgz#a3428bb7088b3a60292f66919278b7c297ad4f07"
+  integrity sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==
+  dependencies:
+    p-limit "^2.2.0"
+
+p-map@^1.1.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-1.2.0.tgz#e4e94f311eabbc8633a1e79908165fca26241b6b"
+  integrity sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==
+
 p-map@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/p-map/-/p-map-2.1.0.tgz#310928feef9c9ecc65b68b17693018a665cea175"
   integrity sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==
 
+p-map@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/p-map/-/p-map-3.0.0.tgz#d704d9af8a2ba684e2600d9a215983d4141a979d"
+  integrity sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==
+  dependencies:
+    aggregate-error "^3.0.0"
+
 p-retry@^3.0.1:
   version "3.0.1"
   resolved "https://registry.yarnpkg.com/p-retry/-/p-retry-3.0.1.tgz#316b4c8893e2c8dc1cfa891f406c4b422bebf328"
@@ -7708,6 +9098,39 @@ package-json@^4.0.0:
     registry-url "^3.0.3"
     semver "^5.1.0"
 
+pacote@9.4.0:
+  version "9.4.0"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-9.4.0.tgz#af979abdeb175cd347c3e33be3241af1ed254807"
+  integrity sha512-WQ1KL/phGMkedYEQx9ODsjj7xvwLSpdFJJdEXrLyw5SILMxcTNt5DTxT2Z93fXuLFYJBlZJdnwdalrQdB/rX5w==
+  dependencies:
+    bluebird "^3.5.3"
+    cacache "^11.3.2"
+    figgy-pudding "^3.5.1"
+    get-stream "^4.1.0"
+    glob "^7.1.3"
+    lru-cache "^5.1.1"
+    make-fetch-happen "^4.0.1"
+    minimatch "^3.0.4"
+    minipass "^2.3.5"
+    mississippi "^3.0.0"
+    mkdirp "^0.5.1"
+    normalize-package-data "^2.4.0"
+    npm-package-arg "^6.1.0"
+    npm-packlist "^1.1.12"
+    npm-pick-manifest "^2.2.3"
+    npm-registry-fetch "^3.8.0"
+    osenv "^0.1.5"
+    promise-inflight "^1.0.1"
+    promise-retry "^1.1.1"
+    protoduck "^5.0.1"
+    rimraf "^2.6.2"
+    safe-buffer "^5.1.2"
+    semver "^5.6.0"
+    ssri "^6.0.1"
+    tar "^4.4.8"
+    unique-filename "^1.1.1"
+    which "^1.3.1"
+
 pako@~1.0.2, pako@~1.0.5:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.6.tgz#0101211baa70c4bca4a0f63f2206e97b7dfaf258"
@@ -7729,6 +9152,13 @@ param-case@2.1.x:
   dependencies:
     no-case "^2.2.0"
 
+parent-module@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2"
+  integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==
+  dependencies:
+    callsites "^3.0.0"
+
 parse-asn1@^5.0.0:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.1.tgz#f6bf293818332bd0dab54efb16087724745e6ca8"
@@ -7775,6 +9205,16 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
+parse5@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-4.0.0.tgz#6d78656e3da8d78b4ec0b906f7c08ef1dfe3f608"
+  integrity sha512-VrZ7eOd3T1Fk4XWNXMgiGBK/z0MG48BWG2uQNU4I72fkQuKUTZpl+u9k+CxEG0twMVzSmXEEz12z5Fnw1jIQFA==
+
+parse5@^5.0.0:
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz#f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"
+  integrity sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==
+
 parseqs@0.0.5:
   version "0.0.5"
   resolved "https://registry.yarnpkg.com/parseqs/-/parseqs-0.0.5.tgz#d5208a3738e46766e291ba2ea173684921a8b89d"
@@ -7809,6 +9249,11 @@ path-browserify@0.0.0:
   resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.0.tgz#a0b870729aae214005b7d5032ec2cbbb0fb4451a"
   integrity sha1-oLhwcpquIUAFt9UDLsLLuw+0RRo=
 
+path-browserify@0.0.1:
+  version "0.0.1"
+  resolved "https://registry.yarnpkg.com/path-browserify/-/path-browserify-0.0.1.tgz#e6c4ddd7ed3aa27c68a20cc4e50e1a4ee83bbc4a"
+  integrity sha512-BapA40NHICOS+USX9SN4tyhq+A2RrN/Ws5F0Z5aMHDp98Fl86lX8Oti8B7uN93L4Ifv4fHOEA+pQw87gmMO/lQ==
+
 path-dirname@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
@@ -7826,6 +9271,11 @@ path-exists@^3.0.0:
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
   integrity sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=
 
+path-exists@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-4.0.0.tgz#513bdbe2d3b95d7762e8c1137efa195c6c61b5b3"
+  integrity sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==
+
 path-is-absolute@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
@@ -7841,7 +9291,7 @@ path-key@^2.0.0, path-key@^2.0.1:
   resolved "https://registry.yarnpkg.com/path-key/-/path-key-2.0.1.tgz#411cadb574c5a140d3a4b1910d40d80cc9f40b40"
   integrity sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=
 
-path-parse@^1.0.5:
+path-parse@^1.0.5, path-parse@^1.0.6:
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
   integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
@@ -7860,6 +9310,13 @@ path-type@^1.0.0:
     pify "^2.0.0"
     pinkie-promise "^2.0.0"
 
+path-type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/path-type/-/path-type-2.0.0.tgz#f012ccb8415b7096fc2daa1054c3d72389594c73"
+  integrity sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=
+  dependencies:
+    pify "^2.0.0"
+
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -7970,6 +9427,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
+pkg-dir@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
 pleeease-filters@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/pleeease-filters/-/pleeease-filters-4.0.0.tgz#6632b2fb05648d2758d865384fbced79e1ccaec7"
@@ -8017,6 +9481,15 @@ portfinder@^1.0.20:
     debug "^2.2.0"
     mkdirp "0.5.x"
 
+portfinder@^1.0.9:
+  version "1.0.25"
+  resolved "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz#254fd337ffba869f4b9d37edc298059cb4d35eca"
+  integrity sha512-6ElJnHBbxVA1XSLgBp7G1FiCkQdlqGzuF7DswL5tcea+E8UpuvPU7beVAjjRwCioTS9ZluNbu+ZyRvgTsmqEBg==
+  dependencies:
+    async "^2.6.2"
+    debug "^3.1.1"
+    mkdirp "^0.5.1"
+
 posix-character-classes@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/posix-character-classes/-/posix-character-classes-0.1.1.tgz#01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"
@@ -8288,6 +9761,16 @@ postcss-image-set-polyfill@^0.3.5:
     postcss "^6.0.1"
     postcss-media-query-parser "^0.2.3"
 
+postcss-import@12.0.1:
+  version "12.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-12.0.1.tgz#cf8c7ab0b5ccab5649024536e565f841928b7153"
+  integrity sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==
+  dependencies:
+    postcss "^7.0.1"
+    postcss-value-parser "^3.2.3"
+    read-cache "^1.0.0"
+    resolve "^1.1.7"
+
 postcss-initial@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-2.0.0.tgz#72715f7336e0bb79351d99ee65c4a253a8441ba4"
@@ -8297,14 +9780,14 @@ postcss-initial@^2.0.0:
     postcss "^6.0.1"
 
 postcss-load-config@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.0.0.tgz#f1312ddbf5912cd747177083c5ef7a19d62ee484"
-  integrity sha512-V5JBLzw406BB8UIfsAWSK2KSwIJ5yoEIVFb4gVkXci0QdKgA24jLmHZ/ghe/GgX0lJ0/D1uUK1ejhzEY94MChQ==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz#c84d692b7bb7b41ddced94ee62e8ab31b417b003"
+  integrity sha512-4pV3JJVPLd5+RueiVVB+gFOAa7GWc25XQcMp86Zexzke69mKf6Nx9LRcQywdz7yZI9n1udOxmLuAwTBypypF8Q==
   dependencies:
-    cosmiconfig "^4.0.0"
+    cosmiconfig "^5.0.0"
     import-cwd "^2.0.0"
 
-postcss-loader@^3.0.0:
+postcss-loader@3.0.0, postcss-loader@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-3.0.0.tgz#6b97943e47c72d845fa9e03f273773d4e8dd6c2d"
   integrity sha512-cLWoDEY5OwHcAjDnkyRQzAXfs2jrKjXpO/HQFcc5b5u/r7aa471wdmChmwfnv7x2u840iat/wi0lQ5nbRgSkUA==
@@ -8393,36 +9876,38 @@ postcss-minify-selectors@^4.0.2:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
-postcss-modules-extract-imports@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-1.2.0.tgz#66140ecece38ef06bf0d3e355d69bf59d141ea85"
-  integrity sha1-ZhQOzs447wa/DT41XWm/WdFB6oU=
+postcss-modules-extract-imports@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-extract-imports/-/postcss-modules-extract-imports-2.0.0.tgz#818719a1ae1da325f9832446b01136eeb493cd7e"
+  integrity sha512-LaYLDNS4SG8Q5WAWqIJgdHPJrDDr/Lv775rMBFUbgjTz6j34lUznACHcdRWroPvXANP2Vj7yNK57vp9eFqzLWQ==
   dependencies:
-    postcss "^6.0.1"
+    postcss "^7.0.5"
 
-postcss-modules-local-by-default@^1.2.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-1.2.0.tgz#f7d80c398c5a393fa7964466bd19500a7d61c069"
-  integrity sha1-99gMOYxaOT+nlkRmvRlQCn1hwGk=
+postcss-modules-local-by-default@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz#e8a6561be914aaf3c052876377524ca90dbb7915"
+  integrity sha512-jM/V8eqM4oJ/22j0gx4jrp63GSvDH6v86OqyTHHUvk4/k1vceipZsaymiZ5PvocqZOl5SFHiFJqjs3la0wnfIQ==
   dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    icss-utils "^4.1.1"
+    postcss "^7.0.16"
+    postcss-selector-parser "^6.0.2"
+    postcss-value-parser "^4.0.0"
 
-postcss-modules-scope@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-1.1.0.tgz#d6ea64994c79f97b62a72b426fbe6056a194bb90"
-  integrity sha1-1upkmUx5+XtipytCb75gVqGUu5A=
+postcss-modules-scope@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-modules-scope/-/postcss-modules-scope-2.1.1.tgz#33d4fc946602eb5e9355c4165d68a10727689dba"
+  integrity sha512-OXRUPecnHCg8b9xWvldG/jUpRIGPNRka0r4D4j0ESUU2/5IOnpsjfPPmDprM3Ih8CgZ8FXjWqaniK5v4rWt3oQ==
   dependencies:
-    css-selector-tokenizer "^0.7.0"
-    postcss "^6.0.1"
+    postcss "^7.0.6"
+    postcss-selector-parser "^6.0.0"
 
-postcss-modules-values@^1.3.0:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-1.3.0.tgz#ecffa9d7e192518389f42ad0e83f72aec456ea20"
-  integrity sha1-7P+p1+GSUYOJ9CrQ6D9yrsRW6iA=
+postcss-modules-values@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-modules-values/-/postcss-modules-values-3.0.0.tgz#5b5000d6ebae29b4255301b4a3a54574423e7f10"
+  integrity sha512-1//E5jCBrZ9DmRX+zCtmQtRSV6PV42Ix7Bzj9GbwJceduuf7IqP8MgeTXuRDHOWj2m0VzZD5+roFWDuU8RQjcg==
   dependencies:
-    icss-replace-symbols "^1.1.0"
-    postcss "^6.0.1"
+    icss-utils "^4.0.0"
+    postcss "^7.0.6"
 
 postcss-nesting@^4.0.1:
   version "4.2.1"
@@ -8638,6 +10123,15 @@ postcss-selector-parser@^5.0.0-rc.4:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss-selector-parser@^6.0.0, postcss-selector-parser@^6.0.2:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz#934cf799d016c83411859e09dcecade01286ec5c"
+  integrity sha512-36P2QR59jDTOAiIkqEprfJDsoNrvwFei3eCqKd1Y0tUsBimsq39BLp7RD+JWny3WgB1zGhJX8XVePwm9k4wdBg==
+  dependencies:
+    cssesc "^3.0.0"
+    indexes-of "^1.0.1"
+    uniq "^1.0.1"
+
 postcss-smart-import@0.7.6:
   version "0.7.6"
   resolved "https://registry.yarnpkg.com/postcss-smart-import/-/postcss-smart-import-0.7.6.tgz#259deb84aa28f138458218ecc0e9a84c61ada6a4"
@@ -8674,16 +10168,21 @@ postcss-unique-selectors@^4.0.1:
     postcss "^7.0.0"
     uniqs "^2.0.0"
 
-postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.1:
+postcss-value-parser@^3.0.0, postcss-value-parser@^3.3.0, postcss-value-parser@^3.3.1:
   version "3.3.1"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz#9ff822547e2893213cf1c30efa51ac5fd1ba8281"
   integrity sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==
 
-postcss-value-parser@^3.2.3, postcss-value-parser@^3.3.0:
+postcss-value-parser@^3.2.3:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-3.3.0.tgz#87f38f9f18f774a4ab4c8a232f5c5ce8872a9d15"
   integrity sha1-h/OPnxj3dKSrTIojL1xc6IcqnRU=
 
+postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.2.tgz#482282c09a42706d1fc9a069b73f44ec08391dc9"
+  integrity sha512-LmeoohTpp/K4UiyQCwuGWlONxXamGzCMtFxLq4W1nZVGIQLYvMCJx3yAF9qyyuFpflABI9yVdtJAqbihOsCsJQ==
+
 postcss-values-parser@^1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/postcss-values-parser/-/postcss-values-parser-1.5.0.tgz#5d9fa63e2bcb0179ce48f3235303765eb89f3047"
@@ -8693,6 +10192,15 @@ postcss-values-parser@^1.5.0:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
+postcss@7.0.14, postcss@^7.0.1, postcss@^7.0.5:
+  version "7.0.14"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
+  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
 postcss@^6.0, postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.14, postcss@^6.0.17, postcss@^6.0.18, postcss@^6.0.22, postcss@^6.0.23, postcss@^6.0.5, postcss@^6.0.6, postcss@^6.0.8:
   version "6.0.23"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-6.0.23.tgz#61c82cc328ac60e677645f979054eb98bc0e3324"
@@ -8702,7 +10210,16 @@ postcss@^6.0, postcss@^6.0.0, postcss@^6.0.1, postcss@^6.0.11, postcss@^6.0.14,
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.0, postcss@^7.0.2:
+postcss@^7.0.0, postcss@^7.0.13, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.23, postcss@^7.0.6:
+  version "7.0.25"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.25.tgz#dd2a2a753d50b13bed7a2009b4a18ac14d9db21e"
+  integrity sha512-NXXVvWq9icrm/TgQC0O6YVFi4StfJz46M1iNd/h6B26Nvh/HKI+q4YZtFN/EjcInZliEscO/WL10BXnc1E5nwg==
+  dependencies:
+    chalk "^2.4.2"
+    source-map "^0.6.1"
+    supports-color "^6.1.0"
+
+postcss@^7.0.2:
   version "7.0.2"
   resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.2.tgz#7b5a109de356804e27f95a960bef0e4d5bc9bb18"
   integrity sha512-fmaUY5370keLUTx+CnwRxtGiuFTcNBLQBqr1oE3WZ/euIYmGAo0OAgOhVJ3ByDnVmOR3PK+0V9VebzfjRIUcqw==
@@ -8711,15 +10228,6 @@ postcss@^7.0.0, postcss@^7.0.2:
     source-map "^0.6.1"
     supports-color "^5.4.0"
 
-postcss@^7.0.1, postcss@^7.0.5:
-  version "7.0.14"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.14.tgz#4527ed6b1ca0d82c53ce5ec1a2041c2346bbd6e5"
-  integrity sha512-NsbD6XUUMZvBxtQAJuWDJeeC4QFsmWsfozWxCJPWf3M55K9iu2iMDaKqyoOdTJ1R4usBXuxlVFAIo8rZPQD4Bg==
-  dependencies:
-    chalk "^2.4.2"
-    source-map "^0.6.1"
-    supports-color "^6.1.0"
-
 prelude-ls@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54"
@@ -8790,6 +10298,28 @@ promise-inflight@^1.0.1:
   resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3"
   integrity sha1-mEcocL8igTL8vdhoEputEsPAKeM=
 
+promise-retry@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/promise-retry/-/promise-retry-1.1.1.tgz#6739e968e3051da20ce6497fb2b50f6911df3d6d"
+  integrity sha1-ZznpaOMFHaIM5kl/srUPaRHfPW0=
+  dependencies:
+    err-code "^1.0.0"
+    retry "^0.10.0"
+
+promise@^7.1.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/promise/-/promise-7.3.1.tgz#064b72602b18f90f29192b8b1bc418ffd1ebd3bf"
+  integrity sha512-nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg==
+  dependencies:
+    asap "~2.0.3"
+
+protoduck@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/protoduck/-/protoduck-5.0.1.tgz#03c3659ca18007b69a50fd82a7ebcc516261151f"
+  integrity sha512-WxoCeDCoCBY55BMvj4cAEjdVUFGRWed9ZxPlqTKYyw1nDDTQ4pqmnIMAGfJlg7Dx35uB/M+PHJPTmGOvaCaPTg==
+  dependencies:
+    genfun "^5.0.0"
+
 protractor-istanbul-plugin@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/protractor-istanbul-plugin/-/protractor-istanbul-plugin-2.0.0.tgz#f6271d2a5d6382488e86ff9fb7770f46a8b2c5e2"
@@ -8967,6 +10497,11 @@ querystringify@^2.0.0:
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.0.0.tgz#fa3ed6e68eb15159457c89b37bc6472833195755"
   integrity sha512-eTPo5t/4bgaMNZxyjWx6N2a6AuE0mq51KWvpc7nU/MAqixcI6v6KrGUKES0HaomdnolQBBXU/++X6/QQ9KL4tw==
 
+querystringify@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz#60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"
+  integrity sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==
+
 random-bytes@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/random-bytes/-/random-bytes-1.0.0.tgz#4f68a1dc0ae58bd3fb95848c30324db75d64360b"
@@ -9041,6 +10576,14 @@ raw-loader@0.5.1:
   resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-0.5.1.tgz#0c3d0beaed8a01c966d9787bf778281252a979aa"
   integrity sha1-DD0L6u2KAclm2Xh793goElKpeao=
 
+raw-loader@1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-1.0.0.tgz#3f9889e73dadbda9a424bce79809b4133ad46405"
+  integrity sha512-Uqy5AqELpytJTRxYT4fhltcKPj0TyaEpzJDcGz7DFJi+pQOOi3GjR/DOdxTkTsF+NzhnldIoG6TORaBlInUuqA==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
+
 rc@^1.0.1, rc@^1.1.6, rc@^1.2.7:
   version "1.2.8"
   resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
@@ -9066,6 +10609,14 @@ read-pkg-up@^1.0.1:
     find-up "^1.0.0"
     read-pkg "^1.0.0"
 
+read-pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-2.0.0.tgz#6b72a8048984e0c41e79510fd5e9fa99b3b549be"
+  integrity sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=
+  dependencies:
+    find-up "^2.0.0"
+    read-pkg "^2.0.0"
+
 read-pkg@^1.0.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
@@ -9075,6 +10626,15 @@ read-pkg@^1.0.0:
     normalize-package-data "^2.3.2"
     path-type "^1.0.0"
 
+read-pkg@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-2.0.0.tgz#8ef1c0623c6a6db0dc6713c4bfac46332b2368f8"
+  integrity sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=
+  dependencies:
+    load-json-file "^2.0.0"
+    normalize-package-data "^2.3.2"
+    path-type "^2.0.0"
+
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -9084,7 +10644,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.0, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
+"readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.4, readable-stream@^2.0.5, readable-stream@^2.0.6, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6, readable-stream@~2.3.6:
   version "2.3.6"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf"
   integrity sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==
@@ -9216,6 +10776,11 @@ regenerator-runtime@^0.11.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
   integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
 
+regenerator-runtime@^0.13.2:
+  version "0.13.3"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
+  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
+
 regex-cache@^0.4.2:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/regex-cache/-/regex-cache-0.4.4.tgz#75bdc58a2a1496cec48a12835bc54c8d562336dd"
@@ -9231,10 +10796,15 @@ regex-not@^1.0.0, regex-not@^1.0.2:
     extend-shallow "^3.0.2"
     safe-regex "^1.1.0"
 
-regex-parser@^2.2.9:
-  version "2.2.9"
-  resolved "https://registry.yarnpkg.com/regex-parser/-/regex-parser-2.2.9.tgz#a372f45a248b62976a568037c1b6e60a60599192"
-  integrity sha512-VncXxOF6uFlYog5prG2j+e2UGJeam5MfNiJnB/qEgo4KTnMm2XrELCg4rNZ6IlaEUZnGlb8aB6lXowCRQtTkkA==
+regexpp@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-2.0.1.tgz#8d19d31cf632482b589049f8281f93dbcba4d07f"
+  integrity sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==
+
+regexpp@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz#dd63982ee3300e67b41c1956f850aa680d9d330e"
+  integrity sha512-Z+hNr7RAVWxznLPuA7DIh8UNX1j9CDrUQxskw9IrBE1Dxue2lyXT+shqEIeLUjrokxIP8CMy1WkjgG3rTsd5/g==
 
 regexpu-core@^1.0.0:
   version "1.0.0"
@@ -9322,11 +10892,6 @@ repeat-element@^1.1.2:
   resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
   integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
 
-repeat-string@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-0.2.2.tgz#c7a8d3236068362059a7e4651fc6884e8b1fb4ae"
-  integrity sha1-x6jTI2BoNiBZp+RlH8aITosftK4=
-
 repeat-string@^1.5.2, repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
@@ -9351,7 +10916,7 @@ request-progress@^2.0.1:
   dependencies:
     throttleit "^1.0.0"
 
-request@2.88.0, request@^2.74.0, request@^2.79.0, request@^2.81.0, request@^2.87.0, request@^2.88.0:
+request@2.88.0, request@^2.79.0, request@^2.81.0, request@^2.83.0, request@^2.87.0, request@^2.88.0:
   version "2.88.0"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.0.tgz#9c2fca4f7d35b592efe57c7f0a55e81052124fef"
   integrity sha512-NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==
@@ -9382,11 +10947,6 @@ require-directory@^2.1.1:
   resolved "https://registry.yarnpkg.com/require-directory/-/require-directory-2.1.1.tgz#8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"
   integrity sha1-jGStX9MNqxyXbiNE/+f3kqam30I=
 
-require-from-string@^2.0.1:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909"
-  integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==
-
 require-main-filename@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz#97f717b69d48784f5f526a6c5aa8ffdda055a4d1"
@@ -9409,25 +10969,23 @@ resolve-cwd@^2.0.0:
   dependencies:
     resolve-from "^3.0.0"
 
+resolve-dir@^1.0.0, resolve-dir@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/resolve-dir/-/resolve-dir-1.0.1.tgz#79a40644c362be82f26effe739c9bb5382046f43"
+  integrity sha1-eaQGRMNivoLybv/nOcm7U4IEb0M=
+  dependencies:
+    expand-tilde "^2.0.0"
+    global-modules "^1.0.0"
+
 resolve-from@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748"
   integrity sha1-six699nWiBvItuZTM17rywoYh0g=
 
-resolve-url-loader@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.npmjs.org/resolve-url-loader/-/resolve-url-loader-2.3.0.tgz#e1b37034d48f22f8cfb9f04c026faaa070fdaf26"
-  integrity sha512-RaEUWgF/B6aTg9VKaOv2o6dfm5f75/lGh8S+SQwoMcBm48WkA2nhLR+V7KEawkxXjU4lLB16IVeHCe7F69nyVw==
-  dependencies:
-    adjust-sourcemap-loader "^1.1.0"
-    camelcase "^4.1.0"
-    convert-source-map "^1.5.1"
-    loader-utils "^1.1.0"
-    lodash.defaults "^4.0.0"
-    rework "^1.0.1"
-    rework-visit "^1.0.0"
-    source-map "^0.5.7"
-    urix "^0.1.0"
+resolve-from@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6"
+  integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve-url@^0.2.1:
   version "0.2.1"
@@ -9446,6 +11004,13 @@ resolve@^1.1.6, resolve@^1.3.2, resolve@^1.5.0:
   dependencies:
     path-parse "^1.0.5"
 
+resolve@^1.1.7, resolve@^1.10.0, resolve@^1.3.3:
+  version "1.13.1"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.13.1.tgz#be0aa4c06acd53083505abb35f4d66932ab35d16"
+  integrity sha512-CxqObCX8K8YtAhOBRg+lrcdn+LK+WYOS8tSjqSFbjtrI5PnS63QPhZl4+yKfrU9tdsbMu9Anr/amegT87M9Z6w==
+  dependencies:
+    path-parse "^1.0.6"
+
 restore-cursor@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
@@ -9454,6 +11019,14 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+restore-cursor@^3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-3.1.0.tgz#39f67c54b3a7a58cea5236d95cf0034239631f7e"
+  integrity sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==
+  dependencies:
+    onetime "^5.1.0"
+    signal-exit "^3.0.2"
+
 ret@~0.1.10:
   version "0.1.15"
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
@@ -9469,23 +11042,10 @@ retry@^0.12.0:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
   integrity sha1-G0KmJmoh8HQh0bC1S33BZ7AcATs=
 
-rework-visit@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/rework-visit/-/rework-visit-1.0.0.tgz#9945b2803f219e2f7aca00adb8bc9f640f842c9a"
-  integrity sha1-mUWygD8hni96ygCtuLyfZA+ELJo=
-
-rework@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/rework/-/rework-1.0.1.tgz#30806a841342b54510aa4110850cd48534144aa7"
-  integrity sha1-MIBqhBNCtUUQqkEQhQzUhTQUSqc=
-  dependencies:
-    convert-source-map "^0.3.3"
-    css "^2.0.0"
-
-rfdc@^1.1.2:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.2.tgz#e6e72d74f5dc39de8f538f65e00c36c18018e349"
-  integrity sha512-92ktAgvZhBzYTIK0Mja9uen5q5J3NRVMoDkJL2VMwq6SXjVCgqvQeVP2XAaUY6HT+XpQYeLSjb3UoitBryKmdA==
+rfdc@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
+  integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==
 
 rgb-hex@^2.1.0:
   version "2.1.0"
@@ -9514,13 +11074,20 @@ rimraf@2, rimraf@2.6.2, rimraf@^2.2.8, rimraf@^2.5.2, rimraf@^2.5.4, rimraf@^2.6
   dependencies:
     glob "^7.0.5"
 
-rimraf@^2.6.3:
+rimraf@2.6.3, rimraf@^2.6.3:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.6.3.tgz#b2d104fe0d8fb27cf9e0a1cda8262dd3833c6cab"
   integrity sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==
   dependencies:
     glob "^7.1.3"
 
+rimraf@^2.7.1:
+  version "2.7.1"
+  resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-2.7.1.tgz#35797f13a7fdadc566142c29d4f07ccad483e3ec"
+  integrity sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==
+  dependencies:
+    glob "^7.1.3"
+
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/ripemd160/-/ripemd160-2.0.2.tgz#a1c1a6f624751577ba5d07914cbc92850585890c"
@@ -9615,13 +11182,34 @@ rxjs-spy@^7.5.1:
     error-stack-parser "^2.0.1"
     stacktrace-gps "^3.0.2"
 
-rxjs@6.2.2, rxjs@^6.0.0, rxjs@^6.1.0:
+rxjs@6.3.3:
+  version "6.3.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.3.3.tgz#3c6a7fa420e844a81390fb1158a9ec614f4bad55"
+  integrity sha512-JTWmoY9tWCs7zvIk/CvRjhjGaOd+OVBM987mxFo+OW66cGpdKjZcpmc74ES1sB//7Kl/PAe8+wEakuhG4pcgOw==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.4.0.tgz#f3bb0fe7bda7fb69deac0c16f17b50b0b8790504"
+  integrity sha512-Z9Yfa11F6B9Sg/BK9MnqnQ+aQYicPLtilXBp2yUtDt2JRCE0h26d33EnfO3ZxoNxG0T92OUucP3Ct7cpfkdFfw==
+  dependencies:
+    tslib "^1.9.0"
+
+rxjs@^6.0.0, rxjs@^6.1.0:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.2.2.tgz#eb75fa3c186ff5289907d06483a77884586e1cf9"
   integrity sha512-0MI8+mkKAXZUF9vMrEoPnaoHkfzBPP4IGwUYRJhIRJF6/w3uByO1e91bEHn8zd43RdkTMKiooYKmwz7RH6zfOQ==
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.5.3:
+  version "6.5.3"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.3.tgz#510e26317f4db91a7eb1de77d9dd9ba0a4899a3a"
+  integrity sha512-wuYsAYYFdWTAnAaPoKGNhfpWwKZbJW+HgAJ+mImp+Epl7BG8oNWBCTyRM8gba9k4lk8BgWdoYm21Mo/RYhhbgA==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
@@ -9666,9 +11254,21 @@ sass-loader@7.1.0:
     pify "^3.0.0"
     semver "^5.5.0"
 
+sass-loader@7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-7.3.1.tgz#a5bf68a04bcea1c13ff842d747150f7ab7d0d23f"
+  integrity sha512-tuU7+zm0pTCynKYHpdqaPpe+MMTQ76I9TPZ7i4/5dZsigE350shQWe5EZNl5dBidM49TPET75tNqRbcsUZWeNA==
+  dependencies:
+    clone-deep "^4.0.1"
+    loader-utils "^1.0.1"
+    neo-async "^2.5.0"
+    pify "^4.0.1"
+    semver "^6.3.0"
+
 sass-resources-loader@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sass-resources-loader/-/sass-resources-loader-2.0.0.tgz#88569c542fbf1f18f33a6578b77cc5b36c56911d"
+  integrity sha512-I+5FfV+Hb29U5Nt8DbslWOBgRmTv1M/EwOn4/4rc6Aqy9yjygoa8UTnyCFXfTZV8FoQyIBZbEyKSBryhByqQbA==
   dependencies:
     async "^2.1.4"
     chalk "^1.1.3"
@@ -9682,6 +11282,11 @@ saucelabs@^1.5.0:
   dependencies:
     https-proxy-agent "^2.2.1"
 
+sax@0.5.x:
+  version "0.5.8"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-0.5.8.tgz#d472db228eb331c2506b0e8c15524adb939d12c1"
+  integrity sha1-1HLbIo6zMcJQaw6MFVJK25OdEsE=
+
 sax@>=0.6.0, sax@^1.2.4, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
@@ -9711,12 +11316,20 @@ schema-utils@^1.0.0:
     ajv-errors "^1.0.0"
     ajv-keywords "^3.1.0"
 
-script-ext-html-webpack-plugin@2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.0.1.tgz#90ac3d77f1892ad9054c3752f0e4673607f6d9a3"
-  integrity sha512-kUH+XhpjG95ABMnWeKCguM7NCOqSrGlYEnJQKgvPIyq5+FzQuACMLzWOB/Lp7t0sKqKLWNLu8i6MmLRKRo1IUw==
+schema-utils@^2.6.0, schema-utils@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.1.tgz#eb78f0b945c7bcfa2082b3565e8db3548011dc4f"
+  integrity sha512-0WXHDs1VDJyo+Zqs9TKLKyD/h7yDpHUhEFsM2CzkICFdoX1av+GBq/J2xRTFfsQO5kBfhZzANf2VcIm84jqDbg==
   dependencies:
-    debug "^3.1.0"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+
+script-ext-html-webpack-plugin@2.1.4:
+  version "2.1.4"
+  resolved "https://registry.yarnpkg.com/script-ext-html-webpack-plugin/-/script-ext-html-webpack-plugin-2.1.4.tgz#7c309354e310bf78523e1b84ca96fd374ceb9880"
+  integrity sha512-7MAv3paAMfh9y2Rg+yQKp9jEGC5cEcmdge4EomRqri10qoczmliYEVPVNz0/5e9QQ202e05qDll9B8zZlY9N1g==
+  dependencies:
+    debug "^4.1.1"
 
 scss-tokenizer@^0.2.3:
   version "0.2.3"
@@ -9748,6 +11361,13 @@ selfsigned@^1.10.4:
   dependencies:
     node-forge "0.7.5"
 
+selfsigned@^1.9.1:
+  version "1.10.7"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz#da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"
+  integrity sha512-8M3wBCzeWIJnQfl43IKwOmC4H/RAp50S8DF60znzjW5GVqTcSe2vWclt7hmYVPkKPlHWOu5EaWOMZ2Y6W8ZXTA==
+  dependencies:
+    node-forge "0.9.0"
+
 semver-diff@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/semver-diff/-/semver-diff-2.1.0.tgz#4bbb8437c8d37e4b0cf1a68fd726ec6d645d6d36"
@@ -9762,24 +11382,29 @@ semver-dsl@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
-semver-intersect@^1.1.2:
+semver-intersect@1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/semver-intersect/-/semver-intersect-1.4.0.tgz#bdd9c06bedcdd2fedb8cd352c3c43ee8c61321f3"
   integrity sha512-d8fvGg5ycKAq0+I6nfWeCx6ffaWJCsBYU0H2Rq56+/zFePYfT8mXkB3tWBSjR5BerkHNZ5eTPIk1/LBYas35xQ==
   dependencies:
     semver "^5.0.0"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0, semver@^5.5.0:
+"semver@2 || 3 || 4 || 5", semver@^5.0.0, semver@^5.0.3, semver@^5.1.0, semver@^5.3.0:
   version "5.5.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.5.1.tgz#7dfdd8814bdb7cabc7be0fb1d734cfb66c940477"
   integrity sha512-PqpAxfrEhlSUWge8dwIp4tZnQ25DIOthpiaHNIthsjEFQD6EvqUKUDM7L8O2rShkFccYo1VjJR0coWfNkCubRw==
 
-semver@^5.0.1:
+semver@5.6.0, semver@^5.0.1:
   version "5.6.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.6.0.tgz#7e74256fbaa49c75aa7c7a205cc22799cac80004"
   integrity sha512-RS9R6R35NYgQn++fkDWaOmqGoj4Ek9gGs+DPxNUZKuwE183xjJroKvyo1IzVFeXvUrvmALy6FWD5xrdJT25gMg==
 
-semver@^6.1.1:
+semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
+  integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
+
+semver@^6.0.0, semver@^6.1.1, semver@^6.1.2, semver@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
   integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
@@ -9827,12 +11452,12 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
-serialize-javascript@^1.4.0:
-  version "1.5.0"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-1.5.0.tgz#1aa336162c88a890ddad5384baebc93a655161fe"
-  integrity sha512-Ga8c8NjAAp46Br4+0oZ2WxJCwIzwP60Gq1YPgU+39PiTVxyed/iKE/zyZI6+UlVYH5Q4PaQdHhcegIFPZTUfoQ==
+"serialize-javascript@>= 2.1.2", serialize-javascript@^1.4.0, serialize-javascript@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz#ecec53b0e0317bdc95ef76ab7074b7384785fa61"
+  integrity sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==
 
-serve-index@^1.9.1:
+serve-index@^1.7.2, serve-index@^1.9.1:
   version "1.9.1"
   resolved "https://registry.yarnpkg.com/serve-index/-/serve-index-1.9.1.tgz#d3768d69b1e7d82e5ce050fff5b453bea12a9239"
   integrity sha1-03aNabHn2C5c4FD/9bRTvqEqkjk=
@@ -9919,6 +11544,13 @@ shallow-clone@^1.0.0:
     kind-of "^5.0.0"
     mixin-object "^2.0.1"
 
+shallow-clone@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/shallow-clone/-/shallow-clone-3.0.1.tgz#8f2981ad92531f55035b01fb230769a40e02efa3"
+  integrity sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==
+  dependencies:
+    kind-of "^6.0.2"
+
 shebang-command@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-1.2.0.tgz#44aac65b695b03398968c39f363fee5deafdf1ea"
@@ -9950,6 +11582,15 @@ shelljs@^0.7.0:
     interpret "^1.0.0"
     rechoir "^0.6.2"
 
+shelljs@^0.8.1:
+  version "0.8.3"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.3.tgz#a7f3319520ebf09ee81275b2368adb286659b097"
+  integrity sha512-fc0BKlAWiLpwZljmOvAOTE/gXawtCoNrP5oaY7KIaQbbyHeQVg01pSEuEGvGh3HEdBU4baCD7wQBwADmM/7f7A==
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
@@ -9967,10 +11608,19 @@ slash@^1.0.0:
   resolved "https://registry.yarnpkg.com/slash/-/slash-1.0.0.tgz#c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"
   integrity sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=
 
-slide@^1.1.3:
-  version "1.1.6"
-  resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
-  integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
+slice-ansi@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-2.1.0.tgz#cacd7693461a637a5788d92a7dd4fba068e81636"
+  integrity sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==
+  dependencies:
+    ansi-styles "^3.2.0"
+    astral-regex "^1.0.0"
+    is-fullwidth-code-point "^2.0.0"
+
+smart-buffer@^4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/smart-buffer/-/smart-buffer-4.1.0.tgz#91605c25d91652f4661ea69ccf45f1b331ca21ba"
+  integrity sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==
 
 snapdragon-node@^2.0.1:
   version "2.1.1"
@@ -10068,15 +11718,36 @@ sockjs@0.3.19:
     faye-websocket "^0.10.0"
     uuid "^3.0.1"
 
+socks-proxy-agent@^4.0.0:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-4.0.2.tgz#3c8991f3145b2799e70e11bd5fbc8b1963116386"
+  integrity sha512-NT6syHhI9LmuEMSK6Kd2V7gNv5KFZoLE7V5udWmn0de+3Mkj3UMA/AJPLyeNUVmElCurSHtUdM3ETpR3z770Wg==
+  dependencies:
+    agent-base "~4.2.1"
+    socks "~2.3.2"
+
+socks@~2.3.2:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.3.3.tgz#01129f0a5d534d2b897712ed8aceab7ee65d78e3"
+  integrity sha512-o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA==
+  dependencies:
+    ip "1.1.5"
+    smart-buffer "^4.1.0"
+
 sortablejs@1.7.0:
   version "1.7.0"
   resolved "https://registry.yarnpkg.com/sortablejs/-/sortablejs-1.7.0.tgz#80a2b2370abd568e1cec8c271131ef30a904fa28"
   integrity sha1-gKKyNwq9Vo4c7IwnETHvMKkE+ig=
 
 source-list-map@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.0.tgz#aaa47403f7b245a92fbc97ea08f250d6087ed085"
-  integrity sha512-I2UmuJSRr/T8jisiROLU3A3ltr+swpniSmNPI4Ml3ZCX6tVnDsuZzK7F2hl5jTqbZBWCEKlj5HRQiPExXLgE8A==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
+  integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
+
+source-list-map@~0.1.7:
+  version "0.1.8"
+  resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-0.1.8.tgz#c550b2ab5427f6b3f21f5afead88c4f5587b2106"
+  integrity sha1-xVCyq1Qn9rPyH1r+rYjE9Vh7IQY=
 
 source-map-loader@0.2.4:
   version "0.2.4"
@@ -10086,7 +11757,7 @@ source-map-loader@0.2.4:
     async "^2.5.0"
     loader-utils "^1.1.0"
 
-source-map-resolve@^0.5.0, source-map-resolve@^0.5.1:
+source-map-resolve@^0.5.0:
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.2.tgz#72e2cc34095543e43b2c62b2c4c10d4a9054f259"
   integrity sha512-MjqsvNwyz1s0k81Goz/9vRBe9SZdB09Bdw+/zYyO+3CuPk6fouTaxscHkgtE8jKvf01kVfl8riHzERQ/kefaSA==
@@ -10097,6 +11768,14 @@ source-map-resolve@^0.5.0, source-map-resolve@^0.5.1:
     source-map-url "^0.4.0"
     urix "^0.1.0"
 
+source-map-support@0.5.10:
+  version "0.5.10"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.10.tgz#2214080bc9d51832511ee2bab96e3c2f9353120c"
+  integrity sha512-YfQ3tQFTK/yzlGJuX8pTwa4tifQj4QS2Mj7UegOu8jAz59MqIiMGPXxQhVQiIMNzayuUSF/jEuVnfFF5JqybmQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@^0.5.0, source-map-support@~0.5.6:
   version "0.5.9"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.9.tgz#41bc953b2534267ea2d605bccfa7bfa3111ced5f"
@@ -10105,6 +11784,14 @@ source-map-support@^0.5.0, source-map-support@~0.5.6:
     buffer-from "^1.0.0"
     source-map "^0.6.0"
 
+source-map-support@^0.5.5, source-map-support@~0.5.10, source-map-support@~0.5.12:
+  version "0.5.16"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz#0ae069e7fe3ba7538c64c98515e35339eac5a042"
+  integrity sha512-efyLRJDr68D9hBBNIPWFjhpFzURh+KJykQwvMyW5UiZzYwoF6l4YMMDIJJEyFWxWCqfyxLzz6tSfUFR+kXXsVQ==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-support@~0.4.0:
   version "0.4.18"
   resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.4.18.tgz#0286a6de8be42641338594e97ccea75f0a2c585f"
@@ -10117,6 +11804,13 @@ source-map-url@^0.4.0:
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.0.tgz#3e935d7ddd73631b97659956d55128e87b5084a3"
   integrity sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=
 
+source-map@0.1.x:
+  version "0.1.43"
+  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
+  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
+  dependencies:
+    amdefine ">=0.0.4"
+
 source-map@0.5.0:
   version "0.5.0"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.0.tgz#0fe96503ac86a5adb5de63f4e412ae4872cdbe86"
@@ -10132,14 +11826,7 @@ source-map@0.7.3:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383"
   integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==
 
-source-map@^0.1.38:
-  version "0.1.43"
-  resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.1.43.tgz#c24bc146ca517c1471f5dacbe2571b2b7f9e3346"
-  integrity sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=
-  dependencies:
-    amdefine ">=0.0.4"
-
-source-map@^0.4.2:
+source-map@^0.4.2, source-map@~0.4.1:
   version "0.4.4"
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.4.4.tgz#eba4f5da9c0dc999de68032d8b4f76173652036b"
   integrity sha1-66T12pwNyZneaAMti092FzZSA2s=
@@ -10163,6 +11850,11 @@ source-map@~0.2.0:
   dependencies:
     amdefine ">=0.0.4"
 
+sourcemap-codec@^1.4.4:
+  version "1.4.6"
+  resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.6.tgz#e30a74f0402bad09807640d39e971090a08ce1e9"
+  integrity sha512-1ZooVLYFxC448piVLBbtOxFcXwnymH9oUF8nRd3CuYDVvkRBxRl6pB4Mtas5a4drtL+E8LDgFkQNcgIw6tc8Hg==
+
 sparkles@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sparkles/-/sparkles-1.0.1.tgz#008db65edce6c50eec0c5e228e1945061dd0437c"
@@ -10217,6 +11909,13 @@ spdy@^4.0.0:
     select-hose "^2.0.0"
     spdy-transport "^3.0.0"
 
+speed-measure-webpack-plugin@1.3.1:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/speed-measure-webpack-plugin/-/speed-measure-webpack-plugin-1.3.1.tgz#69840a5cdc08b4638697dac7db037f595d7f36a0"
+  integrity sha512-qVIkJvbtS9j/UeZumbdfz0vg+QfG/zxonAjzefZrqzkr7xOncLVXkeGbTpzd1gjCBM4PmVNkWlkeTVhgskAGSQ==
+  dependencies:
+    chalk "^2.0.1"
+
 split-string@^3.0.2:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/split-string/-/split-string-3.1.0.tgz#7cb09dda3a86585705c64b39a6466038682e8fe2"
@@ -10231,10 +11930,10 @@ split@0.3:
   dependencies:
     through "2"
 
-sprintf-js@^1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.1.tgz#36be78320afe5801f6cea3ee78b6e5aab940ea0c"
-  integrity sha1-Nr54Mgr+WAH2zqPueLblqrlA6gw=
+sprintf-js@^1.1.2:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
+  integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug==
 
 sprintf-js@~1.0.2:
   version "1.0.3"
@@ -10264,6 +11963,21 @@ ssri@^5.2.4:
   dependencies:
     safe-buffer "^5.1.1"
 
+ssri@^6.0.0, ssri@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8"
+  integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA==
+  dependencies:
+    figgy-pudding "^3.5.1"
+
+ssri@^7.0.0:
+  version "7.1.0"
+  resolved "https://registry.yarnpkg.com/ssri/-/ssri-7.1.0.tgz#92c241bf6de82365b5c7fb4bd76e975522e1294d"
+  integrity sha512-77/WrDZUWocK0mvA5NTRQyveUf+wsrIc6vyrxpS8tVvYBcX215QbafrJR3KtkpskIzoFLqqNuuYQvxaMjXJ/0g==
+  dependencies:
+    figgy-pudding "^3.5.1"
+    minipass "^3.1.1"
+
 stable@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/stable/-/stable-0.1.8.tgz#836eb3c8382fe2936feaf544631017ce7d47a3cf"
@@ -10290,6 +12004,13 @@ static-extend@^0.1.1:
     define-property "^0.2.5"
     object-copy "^0.1.0"
 
+stats-webpack-plugin@0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/stats-webpack-plugin/-/stats-webpack-plugin-0.7.0.tgz#ccffe9b745de8bbb155571e063f8263fc0e2bc06"
+  integrity sha512-NT0YGhwuQ0EOX+uPhhUcI6/+1Sq/pMzNuSCBVT4GbFl/ac6I/JZefBcjlECNfAb1t3GOx5dEj1Z7x0cAxeeVLQ==
+  dependencies:
+    lodash "^4.17.4"
+
 "statuses@>= 1.3.1 < 2", "statuses@>= 1.4.0 < 2", "statuses@>= 1.5.0 < 2", statuses@~1.5.0:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/statuses/-/statuses-1.5.0.tgz#161c7dac177659fd9811f43771fa99381478628c"
@@ -10346,15 +12067,16 @@ stream-shift@^1.0.0:
   resolved "https://registry.yarnpkg.com/stream-shift/-/stream-shift-1.0.0.tgz#d5c752825e5367e786f78e18e445ea223a155952"
   integrity sha1-1cdSgl5TZ+eG944Y5EXqIjoVWVI=
 
-streamroller@0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-0.7.0.tgz#a1d1b7cf83d39afb0d63049a5acbf93493bdf64b"
-  integrity sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==
+streamroller@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
+  integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==
   dependencies:
-    date-format "^1.2.0"
-    debug "^3.1.0"
-    mkdirp "^0.5.1"
-    readable-stream "^2.3.0"
+    async "^2.6.2"
+    date-format "^2.0.0"
+    debug "^3.2.6"
+    fs-extra "^7.0.1"
+    lodash "^4.17.14"
 
 string-replace-loader@^2.1.1:
   version "2.1.1"
@@ -10390,6 +12112,15 @@ string-width@^3.0.0, string-width@^3.1.0:
     is-fullwidth-code-point "^2.0.0"
     strip-ansi "^5.1.0"
 
+string-width@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
+  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.0"
+
 string.prototype.padend@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/string.prototype.padend/-/string.prototype.padend-3.0.0.tgz#f3aaef7c1719f170c5eab1c32bf780d96e21f2f0"
@@ -10439,6 +12170,13 @@ strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   dependencies:
     ansi-regex "^4.1.0"
 
+strip-ansi@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532"
+  integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==
+  dependencies:
+    ansi-regex "^5.0.0"
+
 strip-bom@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
@@ -10468,6 +12206,19 @@ strip-json-comments@^2.0.0, strip-json-comments@~2.0.1:
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
 
+strip-json-comments@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz#85713975a91fb87bf1b305cca77395e40d2a64a7"
+  integrity sha512-VTyMAUfdm047mwKl+u79WIdrZxtFtn+nBxHeb844XBQ9uMNTuTHdx2hc5RiAJYqwTj3wc/xe5HLSdJSkJ+WfZw==
+
+style-loader@0.23.1:
+  version "0.23.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-0.23.1.tgz#cb9154606f3e771ab6c4ab637026a1049174d925"
+  integrity sha512-XK+uv9kWwhZMZ1y7mysB+zoihsEj4wneFWAS5qoiLwzW0WzSqMrrsIy+a3zkQJq0ipFtBpX5W3MqyRIBF/WFGg==
+  dependencies:
+    loader-utils "^1.1.0"
+    schema-utils "^1.0.0"
+
 stylehacks@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
@@ -10477,6 +12228,27 @@ stylehacks@^4.0.0:
     postcss "^7.0.0"
     postcss-selector-parser "^3.0.0"
 
+stylus-loader@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-3.0.2.tgz#27a706420b05a38e038e7cacb153578d450513c6"
+  integrity sha512-+VomPdZ6a0razP+zinir61yZgpw2NfljeSsdUF5kJuEzlo3khXhY19Fn6l8QQz1GRJGtMCo8nG5C04ePyV7SUA==
+  dependencies:
+    loader-utils "^1.0.2"
+    lodash.clonedeep "^4.5.0"
+    when "~3.6.x"
+
+stylus@0.54.5:
+  version "0.54.5"
+  resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.54.5.tgz#42b9560931ca7090ce8515a798ba9e6aa3d6dc79"
+  integrity sha1-QrlWCTHKcJDOhRWnmLqeaqPW3Hk=
+  dependencies:
+    css-parse "1.7.x"
+    debug "*"
+    glob "7.0.x"
+    mkdirp "0.5.x"
+    sax "0.5.x"
+    source-map "0.1.x"
+
 sugarss@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/sugarss/-/sugarss-1.0.1.tgz#be826d9003e0f247735f92365dc3fd7f1bae9e44"
@@ -10491,6 +12263,13 @@ supports-color@5.4.0:
   dependencies:
     has-flag "^3.0.0"
 
+supports-color@6.1.0, supports-color@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
+  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
+  dependencies:
+    has-flag "^3.0.0"
+
 supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
@@ -10503,20 +12282,13 @@ supports-color@^3.1.0:
   dependencies:
     has-flag "^1.0.0"
 
-supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0:
+supports-color@^5.1.0, supports-color@^5.2.0, supports-color@^5.3.0, supports-color@^5.4.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-5.5.0.tgz#e2e69a44ac8772f78a1ec0b35b689df6530efc8f"
   integrity sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^6.1.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-6.1.0.tgz#0764abc69c63d5ac842dd4867e8d025e880df8f3"
-  integrity sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==
-  dependencies:
-    has-flag "^3.0.0"
-
 svgo@^1.0.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.2.0.tgz#305a8fc0f4f9710828c65039bb93d5793225ffc3"
@@ -10537,16 +12309,31 @@ svgo@^1.0.0:
     unquote "~1.1.1"
     util.promisify "~1.0.0"
 
-symbol-observable@^1.2.0:
+symbol-observable@1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804"
   integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==
 
+table@^5.2.3:
+  version "5.4.6"
+  resolved "https://registry.yarnpkg.com/table/-/table-5.4.6.tgz#1292d19500ce3f86053b05f0e8e7e4a3bb21079e"
+  integrity sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==
+  dependencies:
+    ajv "^6.10.2"
+    lodash "^4.17.14"
+    slice-ansi "^2.1.0"
+    string-width "^3.0.0"
+
 tapable@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.0.0.tgz#cbb639d9002eed9c6b5975eb20598d7936f1f9f2"
   integrity sha512-dQRhbNQkRnaqauC7WqSJ21EEksgT0fYZX2lqXzGkpo8JNig9zGZTYoMGvyI2nWmXlE2VSVXVDu7wLVGu/mQEsg==
 
+tapable@^1.1.0, tapable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2"
+  integrity sha512-4WK/bYZmj8xLr+HUCODHGF1ZFzsYffasLUgEiMBY4fgtltdO6B4WJtlSbPaDTLpYTcGVwM2qLnFTICEcNxs3kA==
+
 tar-stream@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.1.0.tgz#d1aaa3661f05b38b5acc9b7020efdca5179a2cc3"
@@ -10580,6 +12367,19 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
+tar@^4.4.8:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
 term-size@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/term-size/-/term-size-1.2.0.tgz#458b83887f288fc56d6fffbfad262e26638efa69"
@@ -10587,6 +12387,58 @@ term-size@^1.2.0:
   dependencies:
     execa "^0.7.0"
 
+terser-webpack-plugin@1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.2.2.tgz#9bff3a891ad614855a7dde0d707f7db5a927e3d9"
+  integrity sha512-1DMkTk286BzmfylAvLXwpJrI7dWa5BnFmscV/2dCr8+c56egFcbaeFAl7+sujAjdmpLam21XRdhA4oifLyiWWg==
+  dependencies:
+    cacache "^11.0.2"
+    find-cache-dir "^2.0.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^1.4.0"
+    source-map "^0.6.1"
+    terser "^3.16.1"
+    webpack-sources "^1.1.0"
+    worker-farm "^1.5.2"
+
+terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
+  integrity sha512-QMxecFz/gHQwteWwSo5nTc6UaICqN1bMedC5sMtUc7y3Ha3Q8y6ZO0iCR8pq4RJC8Hjf0FEPEHZqcMB/+DFCrA==
+  dependencies:
+    cacache "^12.0.2"
+    find-cache-dir "^2.1.0"
+    is-wsl "^1.1.0"
+    schema-utils "^1.0.0"
+    serialize-javascript "^2.1.2"
+    source-map "^0.6.1"
+    terser "^4.1.2"
+    webpack-sources "^1.4.0"
+    worker-farm "^1.7.0"
+
+terser-webpack-plugin@^2.3.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.1.tgz#6a63c27debc15b25ffd2588562ee2eeabdcab923"
+  integrity sha512-dNxivOXmDgZqrGxOttBH6B4xaxT4zNC+Xd+2K8jwGDMK5q2CZI+KZMA1AAnSRT+BTRvuzKsDx+fpxzPAmAMVcA==
+  dependencies:
+    cacache "^13.0.1"
+    find-cache-dir "^3.2.0"
+    jest-worker "^24.9.0"
+    schema-utils "^2.6.1"
+    serialize-javascript "^2.1.2"
+    source-map "^0.6.1"
+    terser "^4.4.3"
+    webpack-sources "^1.4.3"
+
+terser@^3.16.1:
+  version "3.17.0"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-3.17.0.tgz#f88ffbeda0deb5637f9d24b0da66f4e15ab10cb2"
+  integrity sha512-/FQzzPJmCpjAH9Xvk2paiWrFq+5M6aVOf+2KRbwhByISDX/EujxsK+BAvrhb6H+2rtrLCHK9N01wO014vrIwVQ==
+  dependencies:
+    commander "^2.19.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.10"
+
 terser@^3.8.2:
   version "3.8.2"
   resolved "https://registry.yarnpkg.com/terser/-/terser-3.8.2.tgz#48b880f949f8d038aca4dfd00a37c53d96ecf9fb"
@@ -10596,6 +12448,15 @@ terser@^3.8.2:
     source-map "~0.6.1"
     source-map-support "~0.5.6"
 
+terser@^4.1.2, terser@^4.4.3:
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-4.4.3.tgz#401abc52b88869cf904412503b1eb7da093ae2f0"
+  integrity sha512-0ikKraVtRDKGzHrzkCv5rUNDzqlhmhowOBqC0XqUHFpW+vJ45+20/IFBcebwKfiS2Z9fJin6Eo+F1zLZsxi8RA==
+  dependencies:
+    commander "^2.20.0"
+    source-map "~0.6.1"
+    source-map-support "~0.5.12"
+
 text-mask-core@5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/text-mask-core/-/text-mask-core-5.0.1.tgz#86db742bdfe3b4c383bb51a3b4ca342c86110639"
@@ -10606,6 +12467,11 @@ text-mask-core@^5.0.0:
   resolved "https://registry.yarnpkg.com/text-mask-core/-/text-mask-core-5.1.2.tgz#80dd5ebe04825757e46619e691407a9f8b3c1b6f"
   integrity sha1-gN1evgSCV1fkZhnmkUB6n4s8G28=
 
+text-table@^0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
+  integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
+
 throttleit@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/throttleit/-/throttleit-1.0.0.tgz#9e785836daf46743145a5984b6268d828528ac6c"
@@ -10635,7 +12501,7 @@ through2@^2.0.1, through2@^2.0.3:
     readable-stream "~2.3.6"
     xtend "~4.0.1"
 
-through@2, through@X.X.X, through@^2.3.6, through@~2.3, through@~2.3.1:
+through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@~2.3, through@~2.3.1:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -10733,6 +12599,11 @@ toidentifier@1.0.0:
   resolved "https://registry.yarnpkg.com/toidentifier/-/toidentifier-1.0.0.tgz#7e1be3470f1e77948bc43d94a3c8f4d7752ba553"
   integrity sha512-yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw==
 
+toposort@^1.0.0:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/toposort/-/toposort-1.0.7.tgz#2e68442d9f64ec720b8cc89e6443ac6caa950029"
+  integrity sha1-LmhELZ9k7HILjMieZEOsbKqVACk=
+
 touch@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/touch/-/touch-3.1.0.tgz#fe365f5f75ec9ed4e56825e0bb76d24ab74af83b"
@@ -10748,10 +12619,10 @@ tough-cookie@~2.4.3:
     psl "^1.1.24"
     punycode "^1.4.1"
 
-tree-kill@^1.0.0:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.0.tgz#5846786237b4239014f05db156b643212d4c6f36"
-  integrity sha512-DlX6dR0lOIRDFxI0mjL9IYg6OTncLm/Zt+JiBhE5OlFcAR8yc9S7FFXU9so0oda47frdM/JFsk7UjNt9vscKcg==
+tree-kill@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/tree-kill/-/tree-kill-1.2.1.tgz#5398f374e2f292b9dcc7b2e71e30a5c3bb6c743a"
+  integrity sha512-4hjqbObwlh2dLyW4tcz0Ymw0ggoaVDMveUB9w8kFSQScdRLo0gxO9J7WFcUBo+W3C1TLdFIEwNOWebgZZ0RH9Q==
 
 trim-newlines@^1.0.0:
   version "1.0.0"
@@ -10822,16 +12693,10 @@ tsconfig@^7.0.0:
     strip-bom "^3.0.0"
     strip-json-comments "^2.0.0"
 
-tsickle@^0.32.1:
-  version "0.32.1"
-  resolved "https://registry.yarnpkg.com/tsickle/-/tsickle-0.32.1.tgz#f16e94ba80b32fc9ebe320dc94fbc2ca7f3521a5"
-  integrity sha512-JW9j+W0SaMSZGejIFZBk0AiPfnhljK3oLx5SaqxrJhjlvzFyPml5zqG1/PuScUj6yTe1muEqwk5CnDK0cOZmKw==
-  dependencies:
-    jasmine-diff "^0.1.3"
-    minimist "^1.2.0"
-    mkdirp "^0.5.1"
-    source-map "^0.6.0"
-    source-map-support "^0.5.0"
+tslib@^1.7.1:
+  version "1.10.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a"
+  integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ==
 
 tslib@^1.8.0, tslib@^1.8.1, tslib@^1.9.0:
   version "1.9.3"
@@ -10863,6 +12728,13 @@ tsutils@^2.27.2:
   dependencies:
     tslib "^1.8.1"
 
+tsutils@^3.17.1:
+  version "3.17.1"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.17.1.tgz#ed719917f11ca0dee586272b2ac49e015a2dd759"
+  integrity sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==
+  dependencies:
+    tslib "^1.8.1"
+
 tty-browserify@0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/tty-browserify/-/tty-browserify-0.0.0.tgz#a157ba402da24e9bf957f9aa69d524eed42901a6"
@@ -10887,6 +12759,11 @@ type-check@~0.3.2:
   dependencies:
     prelude-ls "~1.1.2"
 
+type-fest@^0.8.1:
+  version "0.8.1"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d"
+  integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==
+
 type-is@~1.6.15, type-is@~1.6.16:
   version "1.6.16"
   resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.16.tgz#f89ce341541c672b25ee7ae3c73dee3b2be50194"
@@ -10903,6 +12780,16 @@ type-is@~1.6.17, type-is@~1.6.18:
     media-typer "0.3.0"
     mime-types "~2.1.24"
 
+type@^1.0.1:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-1.2.0.tgz#848dd7698dafa3e54a6c479e759c4bc3f18847a0"
+  integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
+
+type@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz#5f16ff6ef2eb44f260494dae271033b29c09a9c3"
+  integrity sha512-KBt58xCHry4Cejnc2ISQAF7QY+ORngsWfxezO68+12hKV6lQY8P/psIkcbjeHWn7MqcgciWJyCCevFMJdIXpow==
+
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
@@ -10941,49 +12828,37 @@ typescript@2.4.1:
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.4.1.tgz#c3ccb16ddaa0b2314de031e7e6fee89e5ba346bc"
   integrity sha1-w8yxbdqgsjFN4DHn5v7onlujRrw=
 
-"typescript@>=2.6.2 <2.10", typescript@^2.5.0, typescript@^2.9.1:
+typescript@3.1.6:
+  version "3.1.6"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.1.6.tgz#b6543a83cfc8c2befb3f4c8fba6896f5b0c9be68"
+  integrity sha512-tDMYfVtvpb96msS1lDX9MEdHrW4yOuZ4Kdc4Him9oU796XldPYF/t2+uKoX0BBa0hXXwDlqYQbXY5Rzjzc5hBA==
+
+typescript@3.2.4:
+  version "3.2.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-3.2.4.tgz#c585cb952912263d915b462726ce244ba510ef3d"
+  integrity sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==
+
+"typescript@>=2.6.2 <2.10", typescript@^2.5.0:
   version "2.9.2"
   resolved "https://registry.yarnpkg.com/typescript/-/typescript-2.9.2.tgz#1cbf61d05d6b96269244eb6a3bce4bd914e0f00c"
   integrity sha512-Gr4p6nFNaoufRIY4NMdpQRNmgxVIGMs4Fcu/ujdYk3nAZqk7supzBE9idmvfZIlH/Cuj//dvi+019qEue9lV0w==
 
-uglify-es@^3.3.4:
-  version "3.3.9"
-  resolved "https://registry.yarnpkg.com/uglify-es/-/uglify-es-3.3.9.tgz#0c1c4f0700bed8dbc124cdb304d2592ca203e677"
-  integrity sha512-r+MU0rfv4L/0eeW3xZrd16t4NZfK8Ld4SWVglYBb7ez5uXFWHuVRs6xCTrf1yirs9a4j4Y27nn7SRfO6v67XsQ==
-  dependencies:
-    commander "~2.13.0"
-    source-map "~0.6.1"
-
 uglify-js@3.4.x:
-  version "3.4.8"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.8.tgz#d590777b208258b54131b1ae45bc9d3f68033a3e"
-  integrity sha512-WatYTD84gP/867bELqI2F/2xC9PQBETn/L+7RGq9MQOA/7yFBNvY1UwXqvtILeE6n0ITwBXxp34M0/o70dzj6A==
+  version "3.4.10"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.4.10.tgz#9ad9563d8eb3acdfb8d38597d2af1d815f6a755f"
+  integrity sha512-Y2VsbPVs0FIshJztycsO2SfPk7/KAF/T72qzv9u5EpQ4kB2hQoHlhNQTsNyy6ul7lQtqJN/AoWeS23OzEiEFxw==
   dependencies:
-    commander "~2.17.1"
+    commander "~2.19.0"
     source-map "~0.6.1"
 
 uglify-js@^3.1.4:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.6.0.tgz#704681345c53a8b2079fb6cec294b05ead242ff5"
-  integrity sha512-W+jrUHJr3DXKhrsS7NUVxn3zqMOFn0hL/Ei6v0anCIMoKC93TjcflTagwIHLW7SfMFfiQuktQyFVCFHGUE0+yg==
+  version "3.7.3"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.7.3.tgz#f918fce9182f466d5140f24bb0ff35c2d32dcc6a"
+  integrity sha512-7tINm46/3puUA4hCkKYo4Xdts+JDaVC9ZPRcG8Xw9R4nhO/gZgUM3TENq8IF4Vatk8qCig4MzP/c8G4u2BkVQg==
   dependencies:
-    commander "~2.20.0"
+    commander "~2.20.3"
     source-map "~0.6.1"
 
-uglifyjs-webpack-plugin@^1.2.4:
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/uglifyjs-webpack-plugin/-/uglifyjs-webpack-plugin-1.3.0.tgz#75f548160858163a08643e086d5fefe18a5d67de"
-  integrity sha512-ovHIch0AMlxjD/97j9AYovZxG5wnHOPkL7T1GKochBADp/Zwc44pEWNqpKl1Loupp1WhFg7SlYmHZRUfdAacgw==
-  dependencies:
-    cacache "^10.0.4"
-    find-cache-dir "^1.0.0"
-    schema-utils "^0.4.5"
-    serialize-javascript "^1.4.0"
-    source-map "^0.6.1"
-    uglify-es "^3.3.4"
-    webpack-sources "^1.1.0"
-    worker-farm "^1.5.2"
-
 uid-safe@~2.1.5:
   version "2.1.5"
   resolved "https://registry.yarnpkg.com/uid-safe/-/uid-safe-2.1.5.tgz#2b3d5c7240e8fc2e58f8aa269e5ee49c0857bd3a"
@@ -11037,6 +12912,13 @@ unique-filename@^1.1.0:
   dependencies:
     unique-slug "^2.0.0"
 
+unique-filename@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/unique-filename/-/unique-filename-1.1.1.tgz#1d69769369ada0583103a1e6ae87681b56573230"
+  integrity sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==
+  dependencies:
+    unique-slug "^2.0.0"
+
 unique-slug@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/unique-slug/-/unique-slug-2.0.0.tgz#db6676e7c7cc0629878ff196097c78855ae9f4ab"
@@ -11162,6 +13044,14 @@ url-parse@^1.4.3:
     querystringify "^2.0.0"
     requires-port "^1.0.0"
 
+url-parse@^1.4.7:
+  version "1.4.7"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
+  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
+  dependencies:
+    querystringify "^2.1.1"
+    requires-port "^1.0.0"
+
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -11175,12 +13065,12 @@ use@^3.1.0:
   resolved "https://registry.yarnpkg.com/use/-/use-3.1.1.tgz#d50c8cac79a19fbc20f2911f56eb973f4e10070f"
   integrity sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==
 
-useragent@2.2.1:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.2.1.tgz#cf593ef4f2d175875e8bb658ea92e18a4fd06d8e"
-  integrity sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=
+useragent@2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/useragent/-/useragent-2.3.0.tgz#217f943ad540cb2128658ab23fc960f6a88c9972"
+  integrity sha512-4AoH4pxuSvHCjqLO04sU6U/uE65BYza8l/KKBS0b0hnUPWi+cQ2BpeTEwejCSx9SPV5/U03nniDTrWx5NrmKdw==
   dependencies:
-    lru-cache "2.2.x"
+    lru-cache "4.1.x"
     tmp "0.0.x"
 
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
@@ -11210,6 +13100,13 @@ util@^0.10.3:
   dependencies:
     inherits "2.0.3"
 
+util@^0.11.0:
+  version "0.11.1"
+  resolved "https://registry.yarnpkg.com/util/-/util-0.11.1.tgz#3236733720ec64bb27f6e26f421aaa2e1b588d61"
+  integrity sha512-HShAsny+zS2TZfaXxD9tYj4HQGlBezXZMZuM/S5PKLLoZkShZiGk9o5CzukI1LVHZvjdvZ2Sj1aW/Ndn2NB/HQ==
+  dependencies:
+    inherits "2.0.3"
+
 utila@~0.3:
   version "0.3.3"
   resolved "https://registry.yarnpkg.com/utila/-/utila-0.3.3.tgz#d7e8e7d7e309107092b05f8d9688824d633a4226"
@@ -11235,10 +13132,15 @@ uuid@^3.0.1, uuid@^3.1.0, uuid@^3.2.1, uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
-v8-compile-cache@^2.0.0:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.2.tgz#a428b28bb26790734c4fc8bc9fa106fccebf6a6c"
-  integrity sha512-1wFuMUIM16MDJRCrpbpuEPTUGmM5QMUg0cr3KFwra2XgOgFcPGDQHDh3CszSCD2Zewc/dh/pamNEW8CbfDebUw==
+v8-compile-cache@2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.0.3.tgz#00f7494d2ae2b688cfe2899df6ed2c54bef91dbe"
+  integrity sha512-CNmdbwQMBjwr9Gsmohvm0pbL954tJrNzf6gWL3K+QMQf00PF7ERGrEiLgjuU3mKreLC2MeGhUsNV9ybTbLgd3w==
+
+v8-compile-cache@^2.0.3:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"
+  integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g==
 
 v8flags@^3.0.0:
   version "3.1.1"
@@ -11312,12 +13214,17 @@ vm-browserify@0.0.4:
   dependencies:
     indexof "0.0.1"
 
+vm-browserify@^1.0.1:
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/vm-browserify/-/vm-browserify-1.1.2.tgz#78641c488b8e6ca91a75f511e7a3b32a86e5dda0"
+  integrity sha512-2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==
+
 void-elements@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-2.0.1.tgz#c066afb582bb1cb4128d60ea92392e94d5e9dbec"
   integrity sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=
 
-watchpack@^1.5.0:
+watchpack@^1.5.0, watchpack@^1.6.0:
   version "1.6.0"
   resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz#4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"
   integrity sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==
@@ -11414,22 +13321,30 @@ webpack-bundle-analyzer@^3.3.2:
     opener "^1.5.1"
     ws "^6.0.0"
 
-webpack-cli@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.1.0.tgz#d71a83687dcfeb758fdceeb0fe042f96bcf62994"
-  integrity sha512-p5NeKDtYwjZozUWq6kGNs9w+Gtw/CPvyuXjXn2HMdz8Tie+krjEg8oAtonvIyITZdvpF7XG9xDHwscLr2c+ugQ==
+webpack-cli@^3.2.0:
+  version "3.3.10"
+  resolved "https://registry.yarnpkg.com/webpack-cli/-/webpack-cli-3.3.10.tgz#17b279267e9b4fb549023fae170da8e6e766da13"
+  integrity sha512-u1dgND9+MXaEt74sJR4PR7qkPxXUSQ0RXYq8x1L6Jg1MYVEmGPrH6Ah6C4arD4r0J1P5HKjRqpab36k0eIzPqg==
   dependencies:
-    chalk "^2.4.1"
-    cross-spawn "^6.0.5"
-    enhanced-resolve "^4.0.0"
-    global-modules-path "^2.1.0"
-    import-local "^1.0.0"
-    inquirer "^6.0.0"
-    interpret "^1.1.0"
-    loader-utils "^1.1.0"
-    supports-color "^5.4.0"
-    v8-compile-cache "^2.0.0"
-    yargs "^12.0.1"
+    chalk "2.4.2"
+    cross-spawn "6.0.5"
+    enhanced-resolve "4.1.0"
+    findup-sync "3.0.0"
+    global-modules "2.0.0"
+    import-local "2.0.0"
+    interpret "1.2.0"
+    loader-utils "1.2.3"
+    supports-color "6.1.0"
+    v8-compile-cache "2.0.3"
+    yargs "13.2.4"
+
+webpack-core@^0.6.8:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/webpack-core/-/webpack-core-0.6.9.tgz#fc571588c8558da77be9efb6debdc5a3b172bdc2"
+  integrity sha1-/FcViMhVjad76e+23r3Fo7FyvcI=
+  dependencies:
+    source-list-map "~0.1.7"
+    source-map "~0.4.1"
 
 webpack-dev-middleware@3.2.0:
   version "3.2.0"
@@ -11444,6 +13359,26 @@ webpack-dev-middleware@3.2.0:
     url-join "^4.0.0"
     webpack-log "^2.0.0"
 
+webpack-dev-middleware@3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.4.0.tgz#1132fecc9026fd90f0ecedac5cbff75d1fb45890"
+  integrity sha512-Q9Iyc0X9dP9bAsYskAVJ/hmIZZQwf/3Sy4xCAZgL5cUkjZmUZLt4l5HpbST/Pdgjn3u6pE7u5OdGd1apgzRujA==
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^2.3.1"
+    range-parser "^1.0.3"
+    webpack-log "^2.0.0"
+
+webpack-dev-middleware@3.5.1:
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-3.5.1.tgz#9265b7742ef50f54f54c1d9af022fc17c1be9b88"
+  integrity sha512-4dwCh/AyMOYAybggUr8fiCkRnjVDp+Cqlr9c+aaNB3GJYgRGYQWJ1YX/WAKUNA9dPNHZ6QSN2lYDKqjKSI8Vqw==
+  dependencies:
+    memory-fs "~0.4.1"
+    mime "^2.3.1"
+    range-parser "^1.0.3"
+    webpack-log "^2.0.0"
+
 webpack-dev-middleware@^2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-2.0.6.tgz#a51692801e8310844ef3e3790e1eacfe52326fd4"
@@ -11467,6 +13402,42 @@ webpack-dev-middleware@^3.7.0:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
+webpack-dev-server@3.1.14:
+  version "3.1.14"
+  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.1.14.tgz#60fb229b997fc5a0a1fc6237421030180959d469"
+  integrity sha512-mGXDgz5SlTxcF3hUpfC8hrQ11yhAttuUQWf1Wmb+6zo3x6rb7b9mIfuQvAPLdfDRCGRGvakBWHdHOa0I9p/EVQ==
+  dependencies:
+    ansi-html "0.0.7"
+    bonjour "^3.5.0"
+    chokidar "^2.0.0"
+    compression "^1.5.2"
+    connect-history-api-fallback "^1.3.0"
+    debug "^3.1.0"
+    del "^3.0.0"
+    express "^4.16.2"
+    html-entities "^1.2.0"
+    http-proxy-middleware "~0.18.0"
+    import-local "^2.0.0"
+    internal-ip "^3.0.1"
+    ip "^1.1.5"
+    killable "^1.0.0"
+    loglevel "^1.4.1"
+    opn "^5.1.0"
+    portfinder "^1.0.9"
+    schema-utils "^1.0.0"
+    selfsigned "^1.9.1"
+    semver "^5.6.0"
+    serve-index "^1.7.2"
+    sockjs "0.3.19"
+    sockjs-client "1.3.0"
+    spdy "^4.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^5.1.0"
+    url "^0.11.0"
+    webpack-dev-middleware "3.4.0"
+    webpack-log "^2.0.0"
+    yargs "12.0.2"
+
 webpack-dev-server@^3.1.11:
   version "3.7.2"
   resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.7.2.tgz#f79caa5974b7f8b63268ef5421222a8486d792f5"
@@ -11507,6 +13478,7 @@ webpack-dev-server@^3.1.11:
 webpack-import-glob-loader@^1.6.3:
   version "1.6.3"
   resolved "https://registry.yarnpkg.com/webpack-import-glob-loader/-/webpack-import-glob-loader-1.6.3.tgz#1b1de573f49c2c2afdb814dc13b44b2111b2ea7b"
+  integrity sha512-//xc5CYowGzVyPtj7OAU7mowkuR+ZEfFeeOGdcs/UR4u6IAGpXXBlwjC/YCOggv1vuXKJNyiS4w4GaqcXcEO6Q==
   dependencies:
     glob "^5.0.15"
 
@@ -11535,11 +13507,26 @@ webpack-merge@4.1.4:
   dependencies:
     lodash "^4.17.5"
 
+webpack-merge@4.2.1:
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-4.2.1.tgz#5e923cf802ea2ace4fd5af1d3247368a633489b4"
+  integrity sha512-4p8WQyS98bUJcCvFMbdGZyZmsKuWjWVnVHnAS3FFg0HDaRVrPbkivx2RYCre8UiemD67RsiFFLfn4JhLAin8Vw==
+  dependencies:
+    lodash "^4.17.5"
+
 webpack-node-externals@1.7.2:
   version "1.7.2"
   resolved "https://registry.yarnpkg.com/webpack-node-externals/-/webpack-node-externals-1.7.2.tgz#6e1ee79ac67c070402ba700ef033a9b8d52ac4e3"
   integrity sha512-ajerHZ+BJKeCLviLUUmnyd5B4RavLF76uv3cs6KNuO8W+HuQaEs0y0L7o40NQxdPy5w0pcv8Ew7yPUAQG0UdCg==
 
+webpack-sources@1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.3.0.tgz#2a28dcb9f1f45fe960d8f1493252b5ee6530fa85"
+  integrity sha512-OiVgSrbGu7NEnEvQJJgdSFPl2qWKkWq5lHMhgiToIiN9w34EBnjYzSYs+VbL5KoYiLNtFFa7BZIKxRED3I32pA==
+  dependencies:
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
 webpack-sources@^1.0.1, webpack-sources@^1.1.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.2.0.tgz#18181e0d013fce096faf6f8e6d41eeffffdceac2"
@@ -11548,18 +13535,32 @@ webpack-sources@^1.0.1, webpack-sources@^1.1.0:
     source-list-map "^2.0.0"
     source-map "~0.6.1"
 
-webpack@^4.17.1:
-  version "4.17.1"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.17.1.tgz#0f026e3d823f3fc604f811ed3ea8f0d9b267fb1e"
-  integrity sha512-vdPYogljzWPhFKDj3Gcp01Vqgu7K3IQlybc3XIdKSQHelK1C3eIQuysEUR7MxKJmdandZlQB/9BG2Jb1leJHaw==
+webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack-sources@^1.4.0, webpack-sources@^1.4.1, webpack-sources@^1.4.3:
+  version "1.4.3"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
+  integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
   dependencies:
-    "@webassemblyjs/ast" "1.5.13"
-    "@webassemblyjs/helper-module-context" "1.5.13"
-    "@webassemblyjs/wasm-edit" "1.5.13"
-    "@webassemblyjs/wasm-opt" "1.5.13"
-    "@webassemblyjs/wasm-parser" "1.5.13"
-    acorn "^5.6.2"
-    acorn-dynamic-import "^3.0.0"
+    source-list-map "^2.0.0"
+    source-map "~0.6.1"
+
+webpack-subresource-integrity@1.1.0-rc.6:
+  version "1.1.0-rc.6"
+  resolved "https://registry.yarnpkg.com/webpack-subresource-integrity/-/webpack-subresource-integrity-1.1.0-rc.6.tgz#37f6f1264e1eb378e41465a98da80fad76ab8886"
+  integrity sha512-Az7y8xTniNhaA0620AV1KPwWOqawurVVDzQSpPAeR5RwNbL91GoBSJAAo9cfd+GiFHwsS5bbHepBw1e6Hzxy4w==
+  dependencies:
+    webpack-core "^0.6.8"
+
+webpack@4.29.0:
+  version "4.29.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.29.0.tgz#f2cfef83f7ae404ba889ff5d43efd285ca26e750"
+  integrity sha512-pxdGG0keDBtamE1mNvT5zyBdx+7wkh6mh7uzMOo/uRQ/fhsdj5FXkh/j5mapzs060forql1oXqXN9HJGju+y7w==
+  dependencies:
+    "@webassemblyjs/ast" "1.7.11"
+    "@webassemblyjs/helper-module-context" "1.7.11"
+    "@webassemblyjs/wasm-edit" "1.7.11"
+    "@webassemblyjs/wasm-parser" "1.7.11"
+    acorn "^6.0.5"
+    acorn-dynamic-import "^4.0.0"
     ajv "^6.1.0"
     ajv-keywords "^3.1.0"
     chrome-trace-event "^1.0.0"
@@ -11574,10 +13575,39 @@ webpack@^4.17.1:
     neo-async "^2.5.0"
     node-libs-browser "^2.0.0"
     schema-utils "^0.4.4"
-    tapable "^1.0.0"
-    uglifyjs-webpack-plugin "^1.2.4"
+    tapable "^1.1.0"
+    terser-webpack-plugin "^1.1.0"
     watchpack "^1.5.0"
-    webpack-sources "^1.0.1"
+    webpack-sources "^1.3.0"
+
+webpack@^4.29.6:
+  version "4.41.3"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-4.41.3.tgz#cb7592c43080337dbc9be9e98fc6478eb3981026"
+  integrity sha512-EcNzP9jGoxpQAXq1VOoTet0ik7/VVU1MovIfcUSAjLowc7GhcQku/sOXALvq5nPpSei2HF6VRhibeJSC3i/Law==
+  dependencies:
+    "@webassemblyjs/ast" "1.8.5"
+    "@webassemblyjs/helper-module-context" "1.8.5"
+    "@webassemblyjs/wasm-edit" "1.8.5"
+    "@webassemblyjs/wasm-parser" "1.8.5"
+    acorn "^6.2.1"
+    ajv "^6.10.2"
+    ajv-keywords "^3.4.1"
+    chrome-trace-event "^1.0.2"
+    enhanced-resolve "^4.1.0"
+    eslint-scope "^4.0.3"
+    json-parse-better-errors "^1.0.2"
+    loader-runner "^2.4.0"
+    loader-utils "^1.2.3"
+    memory-fs "^0.4.1"
+    micromatch "^3.1.10"
+    mkdirp "^0.5.1"
+    neo-async "^2.6.1"
+    node-libs-browser "^2.2.1"
+    schema-utils "^1.0.0"
+    tapable "^1.1.3"
+    terser-webpack-plugin "^1.4.3"
+    watchpack "^1.6.0"
+    webpack-sources "^1.4.1"
 
 websocket-driver@>=0.5.1:
   version "0.7.0"
@@ -11592,6 +13622,11 @@ websocket-extensions@>=0.1.1:
   resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.3.tgz#5d2ff22977003ec687a4b87073dfbbac146ccf29"
   integrity sha512-nqHUnMXmBzT0w570r2JpJxfiSD1IzoI+HGVdd3aZ0yNi3ngvQ4jv1dtHt5VGxfI2yj5yqImPhOK4vmIh2xMbGg==
 
+when@~3.6.x:
+  version "3.6.4"
+  resolved "https://registry.yarnpkg.com/when/-/when-3.6.4.tgz#473b517ec159e2b85005497a13983f095412e34e"
+  integrity sha1-RztRfsFZ4rhQBUl6E5g/CVQS404=
+
 which-module@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-1.0.0.tgz#bba63ca861948994ff307736089e3b96026c2a4f"
@@ -11602,7 +13637,7 @@ which-module@^2.0.0:
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
   integrity sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=
 
-which@1, which@^1.1.1, which@^1.2.1, which@^1.2.10, which@^1.2.9, which@^1.3.1:
+which@1, which@^1.1.1, which@^1.2.1, which@^1.2.10, which@^1.2.14, which@^1.2.9, which@^1.3.1:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==
@@ -11623,6 +13658,11 @@ widest-line@^2.0.0:
   dependencies:
     string-width "^2.1.1"
 
+word-wrap@~1.2.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+
 wordwrap@^1.0.0, wordwrap@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-1.0.0.tgz#27584810891456a4171c8d0226441ade90cbcaeb"
@@ -11640,6 +13680,13 @@ worker-farm@^1.5.2:
   dependencies:
     errno "~0.1.7"
 
+worker-farm@^1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/worker-farm/-/worker-farm-1.7.0.tgz#26a94c5391bbca926152002f69b84a4bf772e5a8"
+  integrity sha512-rvw3QTZc8lAxyVrqcSGVm5yP/IJ2UcB3U0graE3LCFoZ0Yn2x4EoVSqJKdB/T5M+FLcRPjz4TDacRf3OCfNUzw==
+  dependencies:
+    errno "~0.1.7"
+
 wrap-ansi@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz#d8fc3d284dd05794fe84973caecdd1cf824fdd85"
@@ -11671,6 +13718,13 @@ write-file-atomic@^2.0.0:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
+write@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/write/-/write-1.0.3.tgz#0800e14523b923a387e415123c865616aae0f5c3"
+  integrity sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==
+  dependencies:
+    mkdirp "^0.5.1"
+
 ws@^6.0.0:
   version "6.2.1"
   resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
@@ -11715,6 +13769,11 @@ xmlhttprequest-ssl@~1.5.4:
   resolved "https://registry.yarnpkg.com/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz#c2876b06168aadc40e57d97e81191ac8f4398b3e"
   integrity sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=
 
+xregexp@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-4.0.0.tgz#e698189de49dd2a18cc5687b05e17c8e43943020"
+  integrity sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==
+
 xtend@^4.0.0, xtend@~4.0.0, xtend@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"
@@ -11740,7 +13799,17 @@ yallist@^3.0.0, yallist@^3.0.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.0.2.tgz#8452b4bb7e83c7c188d8041c1a837c773d6d8bb9"
   integrity sha1-hFK0u36Dx8GI2AQcGoN8dz1ti7k=
 
-yargs-parser@^10.0.0:
+yallist@^3.0.3:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
+  integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
+
+yallist@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
+  integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
+
+yargs-parser@^10.1.0:
   version "10.1.0"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-10.1.0.tgz#7202265b89f7e9e9f2e5765e0fe735a905edbaa8"
   integrity sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==
@@ -11755,7 +13824,7 @@ yargs-parser@^11.1.1:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-yargs-parser@^13.1.1:
+yargs-parser@^13.1.0, yargs-parser@^13.1.1:
   version "13.1.1"
   resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-13.1.1.tgz#d26058532aa06d365fe091f6a1fc06b2f7e5eca0"
   integrity sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==
@@ -11770,6 +13839,31 @@ yargs-parser@^5.0.0:
   dependencies:
     camelcase "^3.0.0"
 
+yargs-parser@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-7.0.0.tgz#8d0ac42f16ea55debd332caf4c4038b3e3f5dfd9"
+  integrity sha1-jQrELxbqVd69MyyvTEA4s+P139k=
+  dependencies:
+    camelcase "^4.1.0"
+
+yargs@12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.2.tgz#fe58234369392af33ecbef53819171eff0f5aadc"
+  integrity sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==
+  dependencies:
+    cliui "^4.0.0"
+    decamelize "^2.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^1.0.1"
+    os-locale "^3.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1 || ^4.0.0"
+    yargs-parser "^10.1.0"
+
 yargs@12.0.5, yargs@^12.0.1:
   version "12.0.5"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz#05f5997b609647b64f66b81e3b4b10a368e7ad13"
@@ -11788,6 +13882,42 @@ yargs@12.0.5, yargs@^12.0.1:
     y18n "^3.2.1 || ^4.0.0"
     yargs-parser "^11.1.1"
 
+yargs@13.2.4:
+  version "13.2.4"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.2.4.tgz#0b562b794016eb9651b98bd37acf364aa5d6dc83"
+  integrity sha512-HG/DWAJa1PAnHT9JAhNa8AbAv3FPaiLzioSjCcmuXXhP8MlpHO5vwls4g4j6n30Z74GVQj8Xa62dWVx1QCGklg==
+  dependencies:
+    cliui "^5.0.0"
+    find-up "^3.0.0"
+    get-caller-file "^2.0.1"
+    os-locale "^3.1.0"
+    require-directory "^2.1.1"
+    require-main-filename "^2.0.0"
+    set-blocking "^2.0.0"
+    string-width "^3.0.0"
+    which-module "^2.0.0"
+    y18n "^4.0.0"
+    yargs-parser "^13.1.0"
+
+yargs@9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-9.0.1.tgz#52acc23feecac34042078ee78c0c007f5085db4c"
+  integrity sha1-UqzCP+7Kw0BCB47njAwAf1CF20w=
+  dependencies:
+    camelcase "^4.1.0"
+    cliui "^3.2.0"
+    decamelize "^1.1.1"
+    get-caller-file "^1.0.1"
+    os-locale "^2.0.0"
+    read-pkg-up "^2.0.0"
+    require-directory "^2.1.1"
+    require-main-filename "^1.0.1"
+    set-blocking "^2.0.0"
+    string-width "^2.0.0"
+    which-module "^2.0.0"
+    y18n "^3.2.1"
+    yargs-parser "^7.0.0"
+
 yargs@^13.2.4:
   version "13.3.0"
   resolved "https://registry.yarnpkg.com/yargs/-/yargs-13.3.0.tgz#4c657a55e07e5f2cf947f8a366567c04a0dedc83"
@@ -11849,7 +13979,7 @@ zip-stream@^2.1.2:
     compress-commons "^2.1.1"
     readable-stream "^3.4.0"
 
-zone.js@^0.8.26:
-  version "0.8.26"
-  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.26.tgz#7bdd72f7668c5a7ad6b118148b4ea39c59d08d2d"
-  integrity sha512-W9Nj+UmBJG251wkCacIkETgra4QgBo/vgoEkb4a2uoLzpQG7qF9nzwoLXWU5xj3Fg2mxGvEDh47mg24vXccYjA==
+zone.js@^0.8.29:
+  version "0.8.29"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.8.29.tgz#8dce92aa0dd553b50bc5bfbb90af9986ad845a12"
+  integrity sha512-mla2acNCMkWXBD+c+yeUrBUrzOxYMNFdQ6FGfigGGtEVBPJx07BQeJekjt9DmH1FtZek4E9rE1eRR9qQpxACOQ==