diff --git a/.github/workflows/ci_check_translations.yml b/.github/workflows/ci_check_translations.yml
index 9f0a3cd2d3..6c0742501c 100644
--- a/.github/workflows/ci_check_translations.yml
+++ b/.github/workflows/ci_check_translations.yml
@@ -40,6 +40,14 @@ jobs:
       - name: install dependencies
         run: yarn install
       - run: yarn blank-state
+        id: blank-state-attempt1
+        continue-on-error: true  
+        env:
+          DBHOST: localhost:27017
+          ELASTICSEARCH_URL: http://localhost:${{ job.services.elasticsearch.ports[9200] }}
+      - run: yarn blank-state --force
+        id: blank-state-attempt2
+        if: steps.blank-state-attempt1.outcome == 'failure'
         env:
           DBHOST: localhost:27017
           ELASTICSEARCH_URL: http://localhost:${{ job.services.elasticsearch.ports[9200] }}
diff --git a/.github/workflows/ci_e2e_cypress.yml b/.github/workflows/ci_e2e_cypress.yml
index 70f9caa62f..11d45e34bb 100644
--- a/.github/workflows/ci_e2e_cypress.yml
+++ b/.github/workflows/ci_e2e_cypress.yml
@@ -82,12 +82,23 @@ jobs:
         if: ${{ failure() }}
         run: cat dummy_extractor_services/logs.log
       - run: yarn blank-state
+        id: blank-state-attempt1
+        continue-on-error: true
         env:
           DBHOST: localhost:27017
           ELASTICSEARCH_URL: http://localhost:${{ job.services.elasticsearch.ports[9200] }}
           DATABASE_NAME: uwazi_e2e
           INDEX_NAME: uwazi_e2e
           TRANSPILED: true
+      - run: yarn blank-state --force
+        id: blank-state-attempt2
+        if: steps.blank-state-attempt1.outcome == 'failure'
+        env:
+          DBHOST: localhost:27017
+          ELASTICSEARCH_URL: http://localhost:${{ job.services.elasticsearch.ports[9200] }}
+          DATABASE_NAME: uwazi_e2e
+          INDEX_NAME: uwazi_e2e
+          TRANSPILED: true          
       - run: yarn ix-config
         env:
           DBHOST: localhost:27017
diff --git a/README.md b/README.md
index b0f8e2a6bd..145d034a0b 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ Before anything else you will need to install the application dependencies:
 - **ElasticSearch 7.17.6** https://www.elastic.co/downloads/past-releases/elasticsearch-7-17-6 Please note that ElasticSearch requires Java. Follow the instructions to install the package manually, you also probably need to disable ml module in the ElasticSearch config file:
   `xpack.ml.enabled: false`
 - **ICU Analysis Plugin (recommended)** [installation](https://www.elastic.co/guide/en/elasticsearch/plugins/current/analysis-icu.html#analysis-icu) Adds support for number sorting in texts and solves other language sorting nuances. This option is activated by setting the env var USE_ELASTIC_ICU=true before running the server (defaults to false/unset).
-- **MongoDB 5.0.27** https://docs.mongodb.com/v4.2/installation/ . If you have a previous version installed, please follow the instructions on how to [upgrade here](https://docs.mongodb.com/manual/release-notes/4.2-upgrade-standalone/). The new mongosh dependency needs to be added [installation](https://www.mongodb.com/docs/mongodb-shell/).
+- **MongoDB 5.0.27** https://www.mongodb.com/docs/v5.0/installation/ . If you have a previous version installed, please follow the instructions on how to [upgrade here](https://www.mongodb.com/docs/manual/release-notes/5.0-upgrade-standalone/). The new mongosh dependency needs to be added [installation](https://www.mongodb.com/docs/mongodb-shell/).
 - **Yarn** https://yarnpkg.com/en/docs/install.
 - **pdftotext (Poppler)** tested to work on version 0.86 but it's recommended to use the latest available for your platform https://poppler.freedesktop.org/. Make sure to **install libjpeg-dev** if you build from source.
 
diff --git a/app/api/auth/encryptPassword.js b/app/api/auth/encryptPassword.js
index 6c1ce355c8..ced5cf7766 100644
--- a/app/api/auth/encryptPassword.js
+++ b/app/api/auth/encryptPassword.js
@@ -5,6 +5,4 @@ const saltRounds = 10;
 const encryptPassword = async plainPassword => bcrypt.hash(plainPassword, saltRounds);
 const comparePasswords = async (plain, hashed) => bcrypt.compare(plain, hashed);
 
-export default encryptPassword;
-
-export { comparePasswords };
+export { comparePasswords, encryptPassword };
diff --git a/app/api/auth/index.js b/app/api/auth/index.js
index 3e68603888..5814970a69 100644
--- a/app/api/auth/index.js
+++ b/app/api/auth/index.js
@@ -3,5 +3,5 @@ import captchaAuthorization from './captchaMiddleware';
 import { CaptchaModel } from './CaptchaModel';
 
 export { needsAuthorization, captchaAuthorization, CaptchaModel };
-export { default as encryptPassword } from './encryptPassword';
-export { comparePasswords } from './encryptPassword';
+export { comparePasswords, encryptPassword } from './encryptPassword';
+export { validatePasswordMiddleWare } from './validatePasswordMiddleWare';
diff --git a/app/api/auth/specs/validatePasswordMiddleWare.spec.ts b/app/api/auth/specs/validatePasswordMiddleWare.spec.ts
new file mode 100644
index 0000000000..92d75fdf82
--- /dev/null
+++ b/app/api/auth/specs/validatePasswordMiddleWare.spec.ts
@@ -0,0 +1,122 @@
+import { Request, NextFunction, Response } from 'express';
+import { testingEnvironment } from 'api/utils/testingEnvironment';
+import { getFixturesFactory } from 'api/utils/fixturesFactory';
+import { UserSchema } from 'shared/types/userType';
+import { UserRole } from 'shared/types/userSchema';
+import { encryptPassword } from '../encryptPassword';
+import { validatePasswordMiddleWare } from '../validatePasswordMiddleWare';
+
+const fixturesFactory = getFixturesFactory();
+
+describe('validatePasswordMiddleWare', () => {
+  const mockResponse = (): Response => {
+    const res: Partial<Response> = {};
+    res.status = jest.fn().mockReturnValue(res);
+    res.json = jest.fn().mockReturnValue(res);
+    return res as Response;
+  };
+
+  const res = mockResponse();
+  const users: UserSchema[] = [];
+  const next: NextFunction = jest.fn();
+
+  const createRequest = (request: Partial<Request>): Request =>
+    <Request>{
+      ...request,
+      user: request.user,
+      body: request.body,
+      headers: request.headers,
+    };
+
+  const gernerateFixtures = async () => {
+    users.push(
+      ...[
+        {
+          ...fixturesFactory.user(
+            'admin',
+            UserRole.ADMIN,
+            'admin@test.com',
+            await encryptPassword('admin1234')
+          ),
+        },
+        {
+          ...fixturesFactory.user(
+            'editor',
+            UserRole.EDITOR,
+            'editor@test.com',
+            await encryptPassword('editor1234')
+          ),
+        },
+      ]
+    );
+
+    return {
+      users,
+    };
+  };
+
+  beforeAll(async () => {
+    const fixtures = await gernerateFixtures();
+    await testingEnvironment.setUp(fixtures);
+  });
+
+  afterEach(() => {
+    jest.clearAllMocks();
+  });
+
+  afterAll(async () => {
+    await testingEnvironment.tearDown();
+  });
+
+  it('should reject when the password is incorrect', async () => {
+    const request = createRequest({
+      user: { _id: users[0]._id, username: users[0].username, role: users[0].role },
+      body: { username: 'a_new_user', role: 'collaborator', email: 'collaborator@huridocs.org' },
+      headers: { authorization: 'Basic wrongPass' },
+    });
+
+    await validatePasswordMiddleWare(request, res, next);
+
+    expect(next).not.toHaveBeenCalled();
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.json).toHaveBeenCalledWith({ message: 'Forbidden', error: 'Password error' });
+  });
+
+  it('should reject when the password is empty', async () => {
+    const emptyPasswordRequest = createRequest({
+      user: { _id: users[0]._id, username: users[0].username, role: users[0].role },
+      body: { username: 'a_new_user', role: 'collaborator', email: 'collaborator@huridocs.org' },
+      headers: { authorization: 'Basic ' },
+    });
+
+    const noAuthHeaderRequest = createRequest({
+      user: { _id: users[0]._id, username: users[0].username, role: users[0].role },
+      body: { _id: users[0]._id, username: users[0].username, role: users[0].role },
+      headers: { cookie: 'some cookie' },
+    });
+
+    await validatePasswordMiddleWare(emptyPasswordRequest, res, next);
+
+    expect(next).not.toHaveBeenCalled();
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.json).toHaveBeenNthCalledWith(1, { message: 'Forbidden', error: 'Password error' });
+
+    await validatePasswordMiddleWare(noAuthHeaderRequest, res, next);
+
+    expect(next).not.toHaveBeenCalled();
+    expect(res.status).toHaveBeenCalledWith(403);
+    expect(res.json).toHaveBeenNthCalledWith(2, { message: 'Forbidden', error: 'Password error' });
+  });
+
+  it('should succeed when the passwords match', async () => {
+    const request = createRequest({
+      user: { _id: users[1]._id, username: users[1].username, role: users[1].role },
+      body: { _id: users[1]._id, username: users[1].username, role: users[1].role },
+      headers: { authorization: 'Basic editor1234' },
+    });
+
+    await validatePasswordMiddleWare(request, res, next);
+
+    expect(next).toHaveBeenCalled();
+  });
+});
diff --git a/app/api/auth/validatePasswordMiddleWare.ts b/app/api/auth/validatePasswordMiddleWare.ts
new file mode 100644
index 0000000000..73409ff59e
--- /dev/null
+++ b/app/api/auth/validatePasswordMiddleWare.ts
@@ -0,0 +1,28 @@
+import { Request, Response, NextFunction } from 'express';
+import { User } from 'api/users/usersModel';
+import usersModel from '../users/users';
+import { comparePasswords } from './encryptPassword';
+
+const validatePassword = async (submittedPassword: string, requestUser: User) => {
+  const user = await usersModel.getById(requestUser._id, '+password');
+  const currentPassword = user.password;
+  return comparePasswords(submittedPassword, currentPassword);
+};
+
+const validatePasswordMiddleWare = async (req: Request, res: Response, next: NextFunction) => {
+  const { user, headers } = req;
+  const submittedPassword = headers?.authorization?.split('Basic ')[1];
+
+  if (submittedPassword) {
+    const validPassword = await validatePassword(submittedPassword, user);
+
+    if (validPassword) {
+      return next();
+    }
+  }
+
+  res.status(403);
+  return res.json({ error: 'Password error', message: 'Forbidden' });
+};
+
+export { validatePasswordMiddleWare };
diff --git a/app/api/auth2fa/routes.ts b/app/api/auth2fa/routes.ts
index 1c1ffe20d8..acdb20faca 100644
--- a/app/api/auth2fa/routes.ts
+++ b/app/api/auth2fa/routes.ts
@@ -3,6 +3,7 @@ import needsAuthorization from 'api/auth/authMiddleware';
 import * as usersUtils from 'api/auth2fa/usersUtils';
 import { validation } from 'api/utils';
 import { ObjectIdAsString } from 'api/utils/ajvSchemas';
+import { validatePasswordMiddleWare } from 'api/auth';
 
 export default (app: Application) => {
   app.post(
@@ -50,6 +51,7 @@ export default (app: Application) => {
   app.post(
     '/api/auth2fa-reset',
     needsAuthorization(['admin']),
+    validatePasswordMiddleWare,
     validation.validateRequest({
       type: 'object',
       properties: {
diff --git a/app/api/services/informationextraction/InformationExtraction.ts b/app/api/services/informationextraction/InformationExtraction.ts
index b658c38830..b7bd04f7fa 100644
--- a/app/api/services/informationextraction/InformationExtraction.ts
+++ b/app/api/services/informationextraction/InformationExtraction.ts
@@ -29,6 +29,7 @@ import {
   FileWithAggregation,
   getFilesForTraining,
   getFilesForSuggestions,
+  propertyTypeIsWithoutExtractedMetadata,
   propertyTypeIsSelectOrMultiSelect,
 } from 'api/services/informationextraction/getFiles';
 import { Suggestions } from 'api/suggestions/suggestions';
@@ -95,6 +96,16 @@ type MaterialsData =
   | TextSelectionMaterialsData
   | ValuesSelectionMaterialsData;
 
+async function fetchCandidates(property: PropertySchema) {
+  const defaultLanguageKey = (await settings.getDefaultLanguage()).key;
+  const query: { template?: ObjectId; language: string } = {
+    language: defaultLanguageKey,
+  };
+  if (property.content !== '') query.template = new ObjectId(property.content);
+  const candidates = await entities.getUnrestricted(query, ['title', 'sharedId']);
+  return candidates;
+}
+
 class InformationExtraction {
   static SERVICE_NAME = 'information_extraction';
 
@@ -142,9 +153,9 @@ class InformationExtraction {
 
     let data: MaterialsData = { ..._data, language_iso };
 
-    const isSelect = propertyTypeIsSelectOrMultiSelect(propertyType);
+    const noExtractedData = propertyTypeIsWithoutExtractedMetadata(propertyType);
 
-    if (!isSelect && propertyLabeledData) {
+    if (!noExtractedData && propertyLabeledData) {
       data = {
         ...data,
         label_text: propertyValue || propertyLabeledData?.selection?.text,
@@ -155,7 +166,7 @@ class InformationExtraction {
       };
     }
 
-    if (isSelect) {
+    if (noExtractedData) {
       if (!Array.isArray(propertyValue)) {
         throw new Error('Property value should be an array');
       }
@@ -184,7 +195,7 @@ class InformationExtraction {
         );
         const { propertyValue, propertyType } = file;
 
-        const missingData = propertyTypeIsSelectOrMultiSelect(propertyType)
+        const missingData = propertyTypeIsWithoutExtractedMetadata(propertyType)
           ? !propertyValue
           : type === 'labeled_data' && !propertyLabeledData;
 
@@ -281,7 +292,10 @@ class InformationExtraction {
           templates,
           template => template.properties || []
         );
-        const property = allProps.find(p => p.name === extractor.property);
+        const property =
+          extractor.property === 'title'
+            ? { name: 'title' as 'title', type: 'title' as 'title' }
+            : allProps.find(p => p.name === extractor.property);
 
         const suggestion = await formatSuggestion(
           property,
@@ -380,15 +394,22 @@ class InformationExtraction {
 
     const params: TaskParameters = {
       id: extractorId.toString(),
-      multi_value: property.type === 'multiselect',
+      multi_value: property.type === 'multiselect' || property.type === 'relationship',
     };
 
-    if (property.type === 'select' || property.type === 'multiselect') {
+    if (propertyTypeIsSelectOrMultiSelect(property.type)) {
       const thesauri = await dictionatiesModel.getById(property.content);
 
       params.options =
         thesauri?.values?.map(value => ({ label: value.label, id: value.id as string })) || [];
     }
+    if (property.type === 'relationship') {
+      const candidates = await fetchCandidates(property);
+      params.options = candidates.map(candidate => ({
+        label: candidate.title || '',
+        id: candidate.sharedId || '',
+      }));
+    }
 
     await this.taskManager.startTask({
       task: 'create_model',
diff --git a/app/api/services/informationextraction/getFiles.ts b/app/api/services/informationextraction/getFiles.ts
index 8ddac8b566..9318260a7a 100644
--- a/app/api/services/informationextraction/getFiles.ts
+++ b/app/api/services/informationextraction/getFiles.ts
@@ -45,9 +45,16 @@ type FileEnforcedNotUndefined = {
 };
 
 const selectProperties: Set<string> = new Set([propertyTypes.select, propertyTypes.multiselect]);
+const propertiesWithoutExtractedMetadata: Set<string> = new Set([
+  ...Array.from(selectProperties),
+  propertyTypes.relationship,
+]);
 
 const propertyTypeIsSelectOrMultiSelect = (type: string) => selectProperties.has(type);
 
+const propertyTypeIsWithoutExtractedMetadata = (type: string) =>
+  propertiesWithoutExtractedMetadata.has(type);
+
 async function getFilesWithAggregations(files: (FileType & FileEnforcedNotUndefined)[]) {
   const filesNames = files.filter(x => x.filename).map(x => x.filename);
 
@@ -98,7 +105,7 @@ async function fileQuery(
   propertyType: string,
   entitiesFromTrainingTemplatesIds: string[]
 ) {
-  const needsExtractedMetadata = !propertyTypeIsSelectOrMultiSelect(propertyType);
+  const needsExtractedMetadata = !propertyTypeIsWithoutExtractedMetadata(propertyType);
   const query: {
     type: string;
     filename: { $exists: Boolean };
@@ -125,7 +132,7 @@ function entityForTrainingQuery(
   const query: {
     [key: string]: { $in?: ObjectIdSchema[]; $exists?: Boolean; $ne?: any[] };
   } = { template: { $in: templates } };
-  if (propertyTypeIsSelectOrMultiSelect(propertyType)) {
+  if (propertyTypeIsWithoutExtractedMetadata(propertyType)) {
     query[`metadata.${property}`] = { $exists: true, $ne: [] };
   }
   return query;
@@ -162,8 +169,8 @@ async function getFilesForTraining(templates: ObjectIdSchema[], property: string
       return { ...file, propertyType };
     }
 
-    if (propertyTypeIsSelectOrMultiSelect(propertyType)) {
-      const propertyValue = (entity.metadata[property] || []).map(({ value, label }) => ({
+    if (propertyTypeIsWithoutExtractedMetadata(propertyType)) {
+      const propertyValue = (entity.metadata?.[property] || []).map(({ value, label }) => ({
         value: ensure<string>(value),
         label: ensure<string>(label),
       }));
@@ -174,6 +181,8 @@ async function getFilesForTraining(templates: ObjectIdSchema[], property: string
     let stringValue: string;
     if (propertyType === propertyTypes.date) {
       stringValue = moment(<number>value * 1000).format('YYYY-MM-DD');
+    } else if (propertyType === propertyTypes.numeric) {
+      stringValue = value?.toString() || '';
     } else {
       stringValue = <string>value;
     }
@@ -221,5 +230,6 @@ export {
   getFilesForSuggestions,
   getSegmentedFilesIds,
   propertyTypeIsSelectOrMultiSelect,
+  propertyTypeIsWithoutExtractedMetadata,
 };
 export type { FileWithAggregation };
diff --git a/app/api/services/informationextraction/ixextractors.ts b/app/api/services/informationextraction/ixextractors.ts
index 4817d6ef5d..1b6032e33f 100644
--- a/app/api/services/informationextraction/ixextractors.ts
+++ b/app/api/services/informationextraction/ixextractors.ts
@@ -8,17 +8,38 @@ import {
   createBlankSuggestionsForExtractor,
   createBlankSuggestionsForPartialExtractor,
 } from 'api/suggestions/blankSuggestions';
-import { propertyTypes } from 'shared/propertyTypes';
+import { Subset } from 'shared/tsUtils';
+import { PropertyTypeSchema } from 'shared/types/commonTypes';
 import { IXExtractorModel as model } from './IXExtractorModel';
 
-const ALLOWED_PROPERTY_TYPES: (typeof propertyTypes)[keyof typeof propertyTypes][] = [
+type AllowedPropertyTypes =
+  | Subset<
+      PropertyTypeSchema,
+      'text' | 'numeric' | 'date' | 'select' | 'multiselect' | 'relationship'
+    >
+  | 'title';
+
+const ALLOWED_PROPERTY_TYPES: AllowedPropertyTypes[] = [
+  'title',
   'text',
   'numeric',
   'date',
   'select',
   'multiselect',
+  'relationship',
 ];
 
+const allowedTypeSet = new Set<string>(ALLOWED_PROPERTY_TYPES);
+
+const typeIsAllowed = (type: string): type is AllowedPropertyTypes => allowedTypeSet.has(type);
+
+const checkTypeIsAllowed = (type: string) => {
+  if (!typeIsAllowed(type)) {
+    throw new Error('Property type not allowed.');
+  }
+  return type;
+};
+
 const templatePropertyExistenceCheck = async (propertyName: string, templateIds: string[]) => {
   const tArray = await templates.get({ _id: { $in: templateIds } });
   const usedTemplates = objectIndex(
@@ -43,9 +64,7 @@ const templatePropertyExistenceCheck = async (propertyName: string, templateIds:
       throw new Error('Missing property.');
     }
 
-    if (!ALLOWED_PROPERTY_TYPES.includes(property.type)) {
-      throw new Error('Property type not allowed.');
-    }
+    checkTypeIsAllowed(property.type);
   });
 };
 
@@ -134,3 +153,6 @@ export const Extractors = {
     await Suggestions.delete({ entityTemplate: templateId, extractorId: { $in: extractorIds } });
   },
 };
+
+export type { AllowedPropertyTypes };
+export { ALLOWED_PROPERTY_TYPES, typeIsAllowed, checkTypeIsAllowed };
diff --git a/app/api/services/informationextraction/specs/InformationExtraction.spec.ts b/app/api/services/informationextraction/specs/InformationExtraction.spec.ts
index fd8de75bfe..513079e23c 100644
--- a/app/api/services/informationextraction/specs/InformationExtraction.spec.ts
+++ b/app/api/services/informationextraction/specs/InformationExtraction.spec.ts
@@ -188,6 +188,25 @@ describe('InformationExtraction', () => {
       );
     });
 
+    it('should send xmls (relationship)', async () => {
+      await informationExtraction.trainModel(factory.id('extractorWithRelationship'));
+
+      const xmlK = await readDocument('K');
+      const xmlL = await readDocument('L');
+
+      expect(IXExternalService.materialsFileParams).toEqual({
+        0: `/xml_to_train/tenant1/${factory.id('extractorWithRelationship')}`,
+        id: factory.id('extractorWithRelationship').toString(),
+        tenant: 'tenant1',
+      });
+
+      expect(IXExternalService.files.length).toBe(2);
+      expect(IXExternalService.files).toEqual(expect.arrayContaining([xmlK, xmlL]));
+      expect(IXExternalService.filesNames.sort()).toEqual(
+        ['documentK.xml', 'documentL.xml'].sort()
+      );
+    });
+
     it('should send labeled data', async () => {
       await informationExtraction.trainModel(factory.id('prop1extractor'));
 
@@ -244,6 +263,48 @@ describe('InformationExtraction', () => {
       });
     });
 
+    it('should send labeled data (relationship)', async () => {
+      await informationExtraction.trainModel(factory.id('extractorWithRelationship'));
+
+      expect(IXExternalService.materials.length).toBe(2);
+      expect(IXExternalService.materials.find(m => m.xml_file_name === 'documentL.xml')).toEqual({
+        xml_file_name: 'documentL.xml',
+        id: factory.id('extractorWithRelationship').toString(),
+        tenant: 'tenant1',
+        xml_segments_boxes: [
+          {
+            left: 1,
+            top: 1,
+            width: 1,
+            height: 1,
+            page_number: 1,
+            text: 'P1',
+          },
+          {
+            left: 1,
+            top: 1,
+            width: 1,
+            height: 1,
+            page_number: 1,
+            text: 'P2',
+          },
+        ],
+        page_width: 13,
+        page_height: 13,
+        language_iso: 'en',
+        values: [
+          {
+            id: 'P1sharedId',
+            label: 'P1',
+          },
+          {
+            id: 'P3sharedId',
+            label: 'P3',
+          },
+        ],
+      });
+    });
+
     it('should sanitize dates before sending', async () => {
       await informationExtraction.trainModel(factory.id('prop2extractor'));
 
@@ -277,7 +338,9 @@ describe('InformationExtraction', () => {
         tenant: 'tenant1',
         task: 'create_model',
       });
+    });
 
+    it('should start the task to train the model (multiselect)', async () => {
       await informationExtraction.trainModel(factory.id('extractorWithMultiselect'));
 
       expect(informationExtraction.taskManager?.startTask).toHaveBeenCalledWith({
@@ -304,10 +367,68 @@ describe('InformationExtraction', () => {
       });
     });
 
+    it('should start the task to train the model (relationship)', async () => {
+      await informationExtraction.trainModel(factory.id('extractorWithRelationship'));
+
+      expect(informationExtraction.taskManager?.startTask).toHaveBeenCalledWith({
+        params: {
+          id: factory.id('extractorWithRelationship').toString(),
+          multi_value: true,
+          options: [
+            {
+              id: 'P1sharedId',
+              label: 'P1',
+            },
+            {
+              id: 'P2sharedId',
+              label: 'P2',
+            },
+            {
+              id: 'P3sharedId',
+              label: 'P3',
+            },
+          ],
+        },
+        tenant: 'tenant1',
+        task: 'create_model',
+      });
+    });
+
+    it('should start the task to train the model (relationship to any template)', async () => {
+      await informationExtraction.trainModel(factory.id('extractorWithRelationshipToAny'));
+
+      expect(informationExtraction.taskManager?.startTask).toHaveBeenCalledWith({
+        params: {
+          id: factory.id('extractorWithRelationshipToAny').toString(),
+          multi_value: true,
+          options: [
+            {
+              id: 'P1sharedId',
+              label: 'P1',
+            },
+            {
+              id: 'P2sharedId',
+              label: 'P2',
+            },
+            {
+              id: 'P3sharedId',
+              label: 'P3',
+            },
+            ...Array.from({ length: 23 }, (_, i) => ({
+              id: `A${i + 1}`,
+              label: `A${i + 1}`,
+            })),
+          ],
+        },
+        tenant: 'tenant1',
+        task: 'create_model',
+      });
+    });
+
     it('should return error status and stop finding suggestions, when there is no labaled data', async () => {
       const expectedError = { status: 'error', message: 'No labeled data' };
-      const result = await informationExtraction.trainModel(factory.id('prop3extractor'));
 
+      const result = await informationExtraction.trainModel(factory.id('prop3extractor'));
       expect(result).toMatchObject(expectedError);
       const [model] = await IXModelsModel.get({ extractorId: factory.id('prop3extractor') });
       expect(model.findingSuggestions).toBe(false);
@@ -320,6 +441,15 @@ describe('InformationExtraction', () => {
         extractorId: factory.id('extractorWithMultiselectWithoutTrainingData'),
       });
       expect(multiSelectModel.findingSuggestions).toBe(false);
+
+      const relationshipResult = await informationExtraction.trainModel(
+        factory.id('extractorWithEmptyRelationship')
+      );
+      expect(relationshipResult).toMatchObject(expectedError);
+      const [relationshipModel] = await IXModelsModel.get({
+        extractorId: factory.id('extractorWithEmptyRelationship'),
+      });
+      expect(relationshipModel.findingSuggestions).toBe(false);
     });
   });
 
@@ -470,6 +600,90 @@ describe('InformationExtraction', () => {
       ]);
     });
 
+    it('should send the materials for the suggestions (relationship)', async () => {
+      await informationExtraction.getSuggestions(factory.id('extractorWithRelationship'));
+
+      const [xmlK, xmlL, xmlM] = await Promise.all(['K', 'L', 'M'].map(readDocument));
+
+      expect(IXExternalService.materialsFileParams).toEqual({
+        0: `/xml_to_predict/tenant1/${factory.id('extractorWithRelationship')}`,
+        id: factory.id('extractorWithRelationship').toString(),
+        tenant: 'tenant1',
+      });
+
+      expect(IXExternalService.filesNames.sort()).toEqual(
+        ['documentK.xml', 'documentL.xml', 'documentM.xml'].sort()
+      );
+      expect(IXExternalService.files.length).toBe(3);
+      expect(IXExternalService.files).toEqual(expect.arrayContaining([xmlK, xmlL, xmlM]));
+
+      expect(IXExternalService.materials.length).toBe(3);
+      const sortedMaterials = sortByStrings(IXExternalService.materials, [
+        (m: any) => m.xml_file_name,
+      ]);
+      expect(sortedMaterials).toEqual([
+        {
+          xml_file_name: 'documentK.xml',
+          id: factory.id('extractorWithRelationship').toString(),
+          tenant: 'tenant1',
+          page_height: 13,
+          page_width: 13,
+          xml_segments_boxes: [
+            {
+              height: 1,
+              left: 1,
+              page_number: 1,
+              text: 'P1',
+              top: 1,
+              width: 1,
+            },
+          ],
+        },
+        {
+          xml_file_name: 'documentL.xml',
+          id: factory.id('extractorWithRelationship').toString(),
+          tenant: 'tenant1',
+          page_height: 13,
+          page_width: 13,
+          xml_segments_boxes: [
+            {
+              height: 1,
+              left: 1,
+              page_number: 1,
+              text: 'P1',
+              top: 1,
+              width: 1,
+            },
+            {
+              height: 1,
+              left: 1,
+              page_number: 1,
+              text: 'P2',
+              top: 1,
+              width: 1,
+            },
+          ],
+        },
+        {
+          xml_file_name: 'documentM.xml',
+          id: factory.id('extractorWithRelationship').toString(),
+          tenant: 'tenant1',
+          page_height: 13,
+          page_width: 13,
+          xml_segments_boxes: [
+            {
+              height: 1,
+              left: 1,
+              page_number: 1,
+              text: 'P3',
+              top: 1,
+              width: 1,
+            },
+          ],
+        },
+      ]);
+    });
+
     it('should avoid sending materials for failed suggestions because no segmentation for instance', async () => {
       await informationExtraction.getSuggestions(factory.id('extractorWithOneFailedSegmentation'));
 
@@ -610,7 +824,7 @@ describe('InformationExtraction', () => {
       IXExternalService.setResults([
         {
           tenant: 'tenant1',
-          property_name: 'property1',
+          id: factory.id('prop1extractor').toString(),
           xml_file_name: 'documentA.xml',
           text: 'text_in_other_language',
           segment_text: 'segmented_text_in_other_language',
@@ -626,7 +840,7 @@ describe('InformationExtraction', () => {
         },
         {
           tenant: 'tenant1',
-          property_name: 'property1',
+          id: factory.id('prop1extractor').toString(),
           xml_file_name: 'documentD.xml',
           text: 'text_in_eng_language',
           segment_text: 'segmented_text_in_eng_language',
@@ -813,7 +1027,7 @@ describe('InformationExtraction', () => {
           },
         ]);
 
-        await saveSuggestionProcess('F1', 'A1', 'eng', 'prop4extractor');
+        await saveSuggestionProcess('F1', 'A1', 'eng', 'prop1extractor');
 
         await informationExtraction.processResults({
           params: { id: factory.id('prop1extractor').toString() },
@@ -823,25 +1037,11 @@ describe('InformationExtraction', () => {
           data_url: 'http://localhost:1234/suggestions_results',
         });
 
-        await informationExtraction.processResults({
-          params: { id: factory.id('prop4extractor').toString() },
-          tenant: 'tenant1',
-          task: 'suggestions',
-          success: true,
-          data_url: 'http://localhost:1234/suggestions_results',
-        });
-
         const suggestionsText = await IXSuggestionsModel.get({
           status: 'ready',
           extractorId: factory.id('prop1extractor'),
         });
         expect(suggestionsText.length).toBe(1);
-
-        const suggestionsMarkdown = await IXSuggestionsModel.get({
-          status: 'ready',
-          propertyName: 'property4',
-        });
-        expect(suggestionsMarkdown.length).toBe(1);
       });
     });
 
@@ -885,16 +1085,19 @@ describe('InformationExtraction', () => {
               id: factory.id('extractorWithSelect').toString(),
               xml_file_name: 'documentG.xml',
               values: [{ id: 'A', label: 'A' }],
+              segment_text: 'it is A',
             },
             {
               id: factory.id('extractorWithSelect').toString(),
               xml_file_name: 'documentH.xml',
               values: [{ id: 'B', label: 'B' }],
+              segment_text: 'it is B',
             },
             {
               id: factory.id('extractorWithSelect').toString(),
               xml_file_name: 'documentI.xml',
               values: [{ id: 'A', label: 'A' }],
+              segment_text: 'it is A',
             },
           ],
           'value'
@@ -947,18 +1150,21 @@ describe('InformationExtraction', () => {
             fileId: factory.id('F17'),
             entityId: 'A17',
             suggestedValue: 'A',
+            segment: 'it is A',
           },
           {
             ...expectedBase,
             fileId: factory.id('F18'),
             entityId: 'A18',
             suggestedValue: 'B',
+            segment: 'it is B',
           },
           {
             ...expectedBase,
             fileId: factory.id('F19'),
             entityId: 'A19',
             suggestedValue: 'A',
+            segment: 'it is A',
             state: {
               ...expectedBase.state,
               withValue: false,
@@ -976,6 +1182,7 @@ describe('InformationExtraction', () => {
               id: factory.id('extractorWithMultiselect').toString(),
               xml_file_name: 'documentG.xml',
               values: [{ id: 'A', label: 'A' }],
+              segment_text: 'it is A',
             },
             {
               id: factory.id('extractorWithMultiselect').toString(),
@@ -984,6 +1191,7 @@ describe('InformationExtraction', () => {
                 { id: 'B', label: 'B' },
                 { id: 'C', label: 'C' },
               ],
+              segment_text: 'it is B or C',
             },
             {
               id: factory.id('extractorWithMultiselect').toString(),
@@ -992,6 +1200,7 @@ describe('InformationExtraction', () => {
                 { id: 'A', label: 'A' },
                 { id: 'C', label: 'C' },
               ],
+              segment_text: 'it is A or C',
             },
           ],
           'value'
@@ -1044,18 +1253,127 @@ describe('InformationExtraction', () => {
             fileId: factory.id('F17'),
             entityId: 'A17',
             suggestedValue: ['A'],
+            segment: 'it is A',
           },
           {
             ...expectedBase,
             fileId: factory.id('F18'),
             entityId: 'A18',
             suggestedValue: ['B', 'C'],
+            segment: 'it is B or C',
           },
           {
             ...expectedBase,
             fileId: factory.id('F19'),
             entityId: 'A19',
             suggestedValue: ['A', 'C'],
+            segment: 'it is A or C',
+            state: {
+              ...expectedBase.state,
+              withValue: false,
+              labeled: false,
+              match: false,
+            },
+          },
+        ]);
+      });
+    });
+
+    describe('relationship', () => {
+      it('should request and store the suggestions (relationship)', async () => {
+        setIXServiceResults(
+          [
+            {
+              id: factory.id('extractorWithRelationship').toString(),
+              xml_file_name: 'documentK.xml',
+              values: [{ id: 'P1sharedId', label: 'P1' }],
+              segment_text: 'it is P1',
+            },
+            {
+              id: factory.id('extractorWithRelationship').toString(),
+              xml_file_name: 'documentL.xml',
+              values: [
+                { id: 'P1sharedId', label: 'P1' },
+                { id: 'P2sharedId', label: 'P2' },
+              ],
+              segment_text: 'it is P1 or P2',
+            },
+            {
+              id: factory.id('extractorWithRelationship').toString(),
+              xml_file_name: 'documentM.xml',
+              values: [{ id: 'P3sharedId', label: 'P3' }],
+              segment_text: 'it is P3',
+            },
+          ],
+          'value'
+        );
+
+        await saveSuggestionProcess('SUG21', 'A21', 'eng', 'extractorWithRelationship');
+        await saveSuggestionProcess('SUG22', 'A22', 'eng', 'extractorWithRelationship');
+        await saveSuggestionProcess('SUG23', 'A23', 'eng', 'extractorWithRelationship');
+
+        await informationExtraction.processResults({
+          params: { id: factory.id('extractorWithRelationship').toString() },
+          tenant: 'tenant1',
+          task: 'suggestions',
+          success: true,
+          data_url: 'http://localhost:1234/suggestions_results',
+        });
+
+        const suggestions = await IXSuggestionsModel.get({
+          status: 'ready',
+          extractorId: factory.id('extractorWithRelationship'),
+        });
+
+        const sorted = sortByStrings(suggestions, [(s: any) => s.entityId]);
+
+        const expectedBase = {
+          _id: expect.any(ObjectId),
+          entityTemplate: factory.id('templateToSegmentF').toString(),
+          language: 'en',
+          propertyName: 'property_relationship',
+          extractorId: factory.id('extractorWithRelationship'),
+          status: 'ready',
+          page: 1,
+          date: expect.any(Number),
+          error: '',
+          state: {
+            labeled: true,
+            withValue: true,
+            withSuggestion: true,
+            match: true,
+            hasContext: true,
+            processing: false,
+            obsolete: false,
+            error: false,
+          },
+        };
+
+        expect(sorted).toEqual([
+          {
+            ...expectedBase,
+            fileId: factory.id('F21'),
+            entityId: 'A21',
+            suggestedValue: ['P1sharedId'],
+            segment: 'it is P1',
+          },
+          {
+            ...expectedBase,
+            fileId: factory.id('F22'),
+            entityId: 'A22',
+            suggestedValue: ['P1sharedId', 'P2sharedId'],
+            segment: 'it is P1 or P2',
+            state: {
+              ...expectedBase.state,
+              match: false,
+            },
+          },
+          {
+            ...expectedBase,
+            fileId: factory.id('F23'),
+            entityId: 'A23',
+            suggestedValue: ['P3sharedId'],
+            segment: 'it is P3',
             state: {
               ...expectedBase.state,
               withValue: false,
diff --git a/app/api/services/informationextraction/specs/fixtures.ts b/app/api/services/informationextraction/specs/fixtures.ts
index 9713847afc..fd87182dee 100644
--- a/app/api/services/informationextraction/specs/fixtures.ts
+++ b/app/api/services/informationextraction/specs/fixtures.ts
@@ -13,6 +13,9 @@ const fixturesPdfNameG = 'documentG.pdf';
 const fixturesPdfNameH = 'documentH.pdf';
 const fixturesPdfNameI = 'documentI.pdf';
 const ficturesPdfNameJ = 'documentJ.pdf';
+const fixturesPdfNameK = 'documentK.pdf';
+const fixturesPdfNameL = 'documentL.pdf';
+const fixturesPdfNameM = 'documentM.pdf';
 
 const fixtures: DBFixture = {
   settings: [
@@ -36,15 +39,26 @@ const fixtures: DBFixture = {
     ]),
     factory.ixExtractor('prop2extractor', 'property2', ['templateToSegmentA']),
     factory.ixExtractor('prop3extractor', 'property3', ['templateToSegmentA']),
-    factory.ixExtractor('prop4extractor', 'property4', ['templateToSegmentA']),
     factory.ixExtractor('extractorWithOneFailedSegmentation', 'property15', ['templateToSegmentC']),
     factory.ixExtractor('extractorWithSelect', 'property_select', ['templateToSegmentD']),
     factory.ixExtractor('extractorWithMultiselect', 'property_multiselect', ['templateToSegmentD']),
     factory.ixExtractor('extractorWithMultiselectWithoutTrainingData', 'property_multiselect', [
       'templateToSegmentE',
     ]),
+    factory.ixExtractor('extractorWithRelationship', 'property_relationship', [
+      'templateToSegmentF',
+    ]),
+    factory.ixExtractor('extractorWithEmptyRelationship', 'property_empty_relationship', [
+      'templateToSegmentF',
+    ]),
+    factory.ixExtractor('extractorWithRelationshipToAny', 'property_relationship_to_any', [
+      'templateToSegmentF',
+    ]),
   ],
   entities: [
+    factory.entity('P1', 'relationshipPartnerTemplate', {}, { sharedId: 'P1sharedId' }),
+    factory.entity('P2', 'relationshipPartnerTemplate', {}, { sharedId: 'P2sharedId' }),
+    factory.entity('P3', 'relationshipPartnerTemplate', {}, { sharedId: 'P3sharedId' }),
     factory.entity(
       'A1',
       'templateToSegmentA',
@@ -102,6 +116,27 @@ const fixtures: DBFixture = {
     factory.entity('A20', 'templateToSegmentE', {
       property_multiselect: [],
     }),
+    factory.entity('A21', 'templateToSegmentF', {
+      property_relationship: [{ value: 'P1sharedId', label: 'P1' }],
+      property_empty_relationship: [],
+      property_relationship_to_any: [{ value: 'P1sharedId', label: 'P1' }],
+    }),
+    factory.entity('A22', 'templateToSegmentF', {
+      property_relationship: [
+        { value: 'P1sharedId', label: 'P1' },
+        { value: 'P3sharedId', label: 'P3' },
+      ],
+      property_empty_relationship: [],
+      property_relationship_to_any: [
+        { value: 'P1', label: 'P1' },
+        { value: 'A1', label: 'A1' },
+      ],
+    }),
+    factory.entity('A23', 'templateToSegmentF', {
+      property_relationship: [],
+      property_empty_relationship: [],
+      property_relationship_to_any: [],
+    }),
   ],
   files: [
     factory.file('F1', 'A1', 'document', fixturesPdfNameA, 'other', '', [
@@ -155,6 +190,9 @@ const fixtures: DBFixture = {
     factory.file('F18', 'A18', 'document', fixturesPdfNameH, 'eng'),
     factory.file('F19', 'A19', 'document', fixturesPdfNameI, 'eng'),
     factory.file('F20', 'A20', 'document', ficturesPdfNameJ, 'eng'),
+    factory.file('F21', 'A21', 'document', fixturesPdfNameK, 'eng'),
+    factory.file('F22', 'A22', 'document', fixturesPdfNameL, 'eng'),
+    factory.file('F23', 'A23', 'document', fixturesPdfNameM, 'eng'),
   ],
   segmentations: [
     {
@@ -291,6 +329,77 @@ const fixtures: DBFixture = {
         paragraphs: [],
       },
     },
+    {
+      _id: factory.id('S11'),
+      filename: fixturesPdfNameK,
+      xmlname: 'documentK.xml',
+      fileID: factory.id('F21'),
+      status: 'ready',
+      segmentation: {
+        page_height: 13,
+        page_width: 13,
+        paragraphs: [
+          {
+            left: 1,
+            top: 1,
+            width: 1,
+            height: 1,
+            page_number: 1,
+            text: 'P1',
+          },
+        ],
+      },
+    },
+    {
+      _id: factory.id('S12'),
+      filename: fixturesPdfNameL,
+      xmlname: 'documentL.xml',
+      fileID: factory.id('F22'),
+      status: 'ready',
+      segmentation: {
+        page_height: 13,
+        page_width: 13,
+        paragraphs: [
+          {
+            left: 1,
+            top: 1,
+            width: 1,
+            height: 1,
+            page_number: 1,
+            text: 'P1',
+          },
+          {
+            left: 1,
+            top: 1,
+            width: 1,
+            height: 1,
+            page_number: 1,
+            text: 'P2',
+          },
+        ],
+      },
+    },
+    {
+      _id: factory.id('S13'),
+      filename: fixturesPdfNameM,
+      xmlname: 'documentM.xml',
+      fileID: factory.id('F23'),
+      status: 'ready',
+      segmentation: {
+        page_height: 13,
+        page_width: 13,
+        paragraphs: [
+          {
+            left: 1,
+            top: 1,
+            width: 1,
+            height: 1,
+            page_number: 1,
+            text: 'P3',
+          },
+        ],
+      },
+    },
   ],
   ixsuggestions: [
     {
@@ -506,6 +615,45 @@ const fixtures: DBFixture = {
       page: 1,
       date: 100,
     },
+    {
+      _id: factory.id('SUG21'),
+      fileId: factory.id('F21'),
+      entityId: 'A21',
+      entityTemplate: factory.idString('templateToSegmentF'),
+      language: 'en',
+      propertyName: 'property_relationship',
+      extractorId: factory.id('extractorWithRelationship'),
+      suggestedValue: ['P1'],
+      status: 'ready',
+      page: 1,
+      date: 100,
+    },
+    {
+      _id: factory.id('SUG22'),
+      fileId: factory.id('F22'),
+      entityId: 'A22',
+      entityTemplate: factory.idString('templateToSegmentF'),
+      language: 'en',
+      propertyName: 'property_relationship',
+      extractorId: factory.id('extractorWithRelationship'),
+      suggestedValue: ['P1', 'P2'],
+      status: 'ready',
+      page: 1,
+      date: 100,
+    },
+    {
+      _id: factory.id('SUG23'),
+      fileId: factory.id('F23'),
+      entityId: 'A23',
+      entityTemplate: factory.idString('templateToSegmentF'),
+      language: 'en',
+      propertyName: 'property_relationship',
+      extractorId: factory.id('extractorWithRelationship'),
+      suggestedValue: [],
+      status: 'ready',
+      page: 1,
+      date: 100,
+    },
   ],
   ixmodels: [
     {
@@ -556,13 +704,36 @@ const fixtures: DBFixture = {
       status: 'ready',
       findingSuggestions: false,
     },
+    {
+      extractorId: factory.id('extractorWithRelationship'),
+      creationDate: 200,
+      status: 'ready',
+      findingSuggestions: true,
+    },
+    {
+      extractorId: factory.id('extractorWithEmptyRelationship'),
+      creationDate: 200,
+      status: 'ready',
+      findingSuggestions: true,
+    },
+    {
+      extractorId: factory.id('extractorWithRelationshipToAny'),
+      creationDate: 200,
+      status: 'ready',
+      findingSuggestions: true,
+    },
+  ],
+  relationtypes: [
+    factory.relationType('related'),
+    factory.relationType('emptyRelated'),
+    factory.relationType('relatedToAny'),
   ],
   templates: [
+    factory.template('relationshipPartnerTemplate'),
     factory.template('templateToSegmentA', [
       factory.property('property1', 'text'),
       factory.property('property2', 'date'),
       factory.property('property3', 'numeric'),
-      factory.property('property4', 'markdown'),
     ]),
     factory.template('templateToSegmentB', [factory.property('property1', 'text')]),
     factory.template('templateToSegmentC', [factory.property('property15', 'text')]),
@@ -579,6 +750,20 @@ const fixtures: DBFixture = {
         content: factory.id('thesauri1').toString(),
       }),
     ]),
+    factory.template('templateToSegmentF', [
+      factory.property('property_relationship', 'relationship', {
+        content: factory.idString('relationshipPartnerTemplate'),
+        relationType: factory.idString('related'),
+      }),
+      factory.property('property_empty_relationship', 'relationship', {
+        content: factory.idString('relationshipPartnerTemplate'),
+        relationType: factory.idString('emptyRelated'),
+      }),
+      factory.property('property_relationship_to_any', 'relationship', {
+        content: '',
+        relationType: factory.idString('relatedToAny'),
+      }),
+    ]),
   ],
   dictionaries: [factory.thesauri('thesauri1', ['A', 'B', 'C'])],
 };
diff --git a/app/api/services/informationextraction/specs/suggestionFormatting.spec.ts b/app/api/services/informationextraction/specs/suggestionFormatting.spec.ts
new file mode 100644
index 0000000000..39f20fd93f
--- /dev/null
+++ b/app/api/services/informationextraction/specs/suggestionFormatting.spec.ts
@@ -0,0 +1,557 @@
+import { getFixturesFactory } from 'api/utils/fixturesFactory';
+import { PropertySchema } from 'shared/types/commonTypes';
+import { EntitySchema } from 'shared/types/entityType';
+import { IXSuggestionType } from 'shared/types/suggestionType';
+import { formatSuggestion } from '../suggestionFormatting';
+import { InternalIXResultsMessage } from '../InformationExtraction';
+
+const fixtureFactory = getFixturesFactory();
+
+const successMessage: InternalIXResultsMessage = {
+  tenant: 'tenant',
+  task: 'suggestions',
+  params: {
+    id: fixtureFactory.id('extractor_id'),
+  },
+  data_url: 'data_url',
+  file_url: 'file_url',
+  success: true,
+};
+
+const properties: Record<string, PropertySchema> = {
+  text: fixtureFactory.property('text_property', 'text'),
+  numeric: fixtureFactory.property('numeric_property', 'numeric'),
+  date: fixtureFactory.property('date_property', 'date'),
+  select: fixtureFactory.property('select_property', 'select'),
+  multiselect: fixtureFactory.property('multiselect_property', 'multiselect'),
+  relationship: fixtureFactory.property('relationship_property', 'relationship'),
+};
+
+const entities: Record<string, EntitySchema> = {
+  title: fixtureFactory.entity('entity_id', 'entity_template', {}),
+  text: fixtureFactory.entity('entity_id', 'entity_template', {
+    text_property: [{ value: 'previous_value' }],
+  }),
+  numeric: fixtureFactory.entity('entity_id', 'entity_template', {
+    numeric_property: [{ value: 0 }],
+  }),
+  date: fixtureFactory.entity('entity_id', 'entity_template', {
+    date_property: [{ value: 0 }],
+  }),
+  select: fixtureFactory.entity('entity_id', 'entity_template', {
+    select_property: [{ value: 'A_id', label: 'A' }],
+  }),
+  multiselect: fixtureFactory.entity('entity_id', 'entity_template', {
+    multiselect_property: [
+      { value: 'A_id', label: 'A' },
+      { value: 'B_id', label: 'B' },
+    ],
+  }),
+  relationship: fixtureFactory.entity('entity_id', 'entity_template', {
+    relationship_property: [
+      { value: 'related_1_id', label: 'related_1_title' },
+      { value: 'related_2_id', label: 'related_2_title' },
+    ],
+  }),
+};
+
+const currentSuggestionBase = {
+  _id: fixtureFactory.id('suggestion_id'),
+  entityId: 'entity_id',
+  extractorId: fixtureFactory.id('extractor_id'),
+  entityTemplate: 'entity_template',
+  fileId: fixtureFactory.id('file_id'),
+  segment: 'previous_context',
+  language: 'en',
+  page: 100,
+  date: 1,
+  status: 'ready' as 'ready',
+  error: '',
+  selectionRectangles: [
+    {
+      top: 13,
+      left: 13,
+      width: 13,
+      height: 13,
+      page: '100',
+    },
+  ],
+};
+
+const currentSuggestions: Record<string, IXSuggestionType> = {
+  title: {
+    ...currentSuggestionBase,
+    propertyName: 'title',
+    suggestedValue: 'previous_value',
+  },
+  text: {
+    ...currentSuggestionBase,
+    propertyName: 'text_property',
+    suggestedValue: 'previous_value',
+  },
+  numeric: {
+    ...currentSuggestionBase,
+    propertyName: 'numeric_property',
+    suggestedValue: 0,
+  },
+  date: {
+    ...currentSuggestionBase,
+    propertyName: 'date_property',
+    suggestedValue: 0,
+  },
+  select: {
+    ...currentSuggestionBase,
+    propertyName: 'select_property',
+    suggestedValue: 'A_id',
+  },
+  multiselect: {
+    ...currentSuggestionBase,
+    propertyName: 'multiselect_property',
+    suggestedValue: ['A_id', 'B_id'],
+  },
+  relationship: {
+    ...currentSuggestionBase,
+    propertyName: 'relationship_property',
+    suggestedValue: ['related_1_id', 'related_2_id'],
+  },
+};
+
+const rawSuggestionBase = {
+  tenant: 'tenant',
+  id: 'extractor_id',
+  xml_file_name: 'file.xml',
+  segment_text: 'new context',
+};
+
+const suggestedDateTimeStamp = 1717743209000;
+const suggestedDateText = new Date(suggestedDateTimeStamp).toISOString();
+
+const validRawSuggestions = {
+  title: {
+    ...rawSuggestionBase,
+    text: 'recommended_value',
+    segments_boxes: [
+      {
+        top: 0,
+        left: 0,
+        width: 0,
+        height: 0,
+        page_number: 1,
+      },
+    ],
+  },
+  text: {
+    ...rawSuggestionBase,
+    text: 'recommended_value',
+    segments_boxes: [
+      {
+        top: 0,
+        left: 0,
+        width: 0,
+        height: 0,
+        page_number: 1,
+      },
+    ],
+  },
+  numeric: {
+    ...rawSuggestionBase,
+    text: '42',
+    segments_boxes: [
+      {
+        top: 0,
+        left: 0,
+        width: 0,
+        height: 0,
+        page_number: 1,
+      },
+    ],
+  },
+  date: {
+    ...rawSuggestionBase,
+    text: suggestedDateText,
+    segments_boxes: [
+      {
+        top: 0,
+        left: 0,
+        width: 0,
+        height: 0,
+        page_number: 1,
+      },
+    ],
+  },
+  select: {
+    ...rawSuggestionBase,
+    values: [{ id: 'B_id', label: 'B' }],
+  },
+  multiselect: {
+    ...rawSuggestionBase,
+    values: [
+      { id: 'C_id', label: 'C' },
+      { id: 'D_id', label: 'D' },
+    ],
+  },
+  relationship: {
+    ...rawSuggestionBase,
+    values: [
+      { id: 'related_1_id', label: 'related_1_title' },
+      { id: 'related_3_id', label: 'related_3_title' },
+    ],
+  },
+};
+
+describe('formatSuggestion', () => {
+  it.each([
+    {
+      case: 'missing properties',
+      property: properties.text,
+      rawSuggestion: {
+        ...validRawSuggestions.text,
+        tenant: undefined,
+      },
+      currentSuggestion: currentSuggestions.text,
+      entity: entities.text,
+      expectedErrorMessage: ": must have required property 'tenant'",
+    },
+    {
+      case: 'invalid tenant type',
+      property: properties.text,
+      rawSuggestion: {
+        ...validRawSuggestions.text,
+        tenant: 1,
+      },
+      currentSuggestion: currentSuggestions.text,
+      entity: entities.text,
+      expectedErrorMessage: '/tenant: must be string',
+    },
+    {
+      case: 'invalid id type',
+      property: properties.text,
+      rawSuggestion: {
+        ...validRawSuggestions.text,
+        id: 1,
+      },
+      currentSuggestion: currentSuggestions.text,
+      entity: entities.text,
+      expectedErrorMessage: '/id: must be string',
+    },
+    {
+      case: 'invalid xml_file_name type',
+      property: properties.text,
+      rawSuggestion: {
+        ...validRawSuggestions.text,
+        xml_file_name: 1,
+      },
+      currentSuggestion: currentSuggestions.text,
+      entity: entities.text,
+      expectedErrorMessage: '/xml_file_name: must be string',
+    },
+    {
+      case: 'invalid text type',
+      property: properties.text,
+      rawSuggestion: {
+        ...validRawSuggestions.text,
+        text: 1,
+      },
+      currentSuggestion: currentSuggestions.text,
+      entity: entities.text,
+      expectedErrorMessage: '/text: must be string',
+    },
+    {
+      case: 'invalid segment_text type',
+      property: properties.text,
+      rawSuggestion: {
+        ...validRawSuggestions.text,
+        segment_text: 1,
+      },
+      currentSuggestion: currentSuggestions.text,
+      entity: entities.text,
+      expectedErrorMessage: '/segment_text: must be string',
+    },
+    {
+      case: 'invalid segments_boxes subtype',
+      property: properties.text,
+      rawSuggestion: {
+        ...validRawSuggestions.text,
+        segments_boxes: [
+          {
+            top: 0,
+            left: 0,
+            width: 0,
+            height: 0,
+            page_number: '1',
+          },
+        ],
+      },
+      currentSuggestion: currentSuggestions.text,
+      entity: entities.text,
+      expectedErrorMessage: '/segments_boxes/0/page_number: must be number',
+    },
+    {
+      case: 'invalid select values type',
+      property: properties.select,
+      rawSuggestion: {
+        ...validRawSuggestions.select,
+        values: 1,
+      },
+      currentSuggestion: currentSuggestions.select,
+      entity: entities.select,
+      expectedErrorMessage: '/values: must be array',
+    },
+    {
+      case: 'invalid select values subtype',
+      property: properties.select,
+      rawSuggestion: {
+        ...validRawSuggestions.select,
+        values: [{ id: 1, label: 'value_label' }],
+      },
+      currentSuggestion: currentSuggestions.select,
+      entity: entities.select,
+      expectedErrorMessage: '/values/0/id: must be string',
+    },
+    {
+      case: 'invalid select values length',
+      property: properties.select,
+      rawSuggestion: {
+        ...validRawSuggestions.select,
+        values: [
+          { id: 'B_id', label: 'B' },
+          { id: 'C_id', label: 'C' },
+        ],
+      },
+      currentSuggestion: currentSuggestions.select,
+      entity: entities.select,
+      expectedErrorMessage: 'Select suggestions must have one or zero values.',
+    },
+    {
+      case: 'invalid multiselect values type',
+      property: properties.multiselect,
+      rawSuggestion: {
+        ...validRawSuggestions.multiselect,
+        values: 1,
+      },
+      currentSuggestion: currentSuggestions.multiselect,
+      entity: entities.multiselect,
+      expectedErrorMessage: '/values: must be array',
+    },
+    {
+      case: 'invalid multiselect values subtype',
+      property: properties.multiselect,
+      rawSuggestion: {
+        ...validRawSuggestions.multiselect,
+        values: [{ id: 1, label: 'value_label' }],
+      },
+      currentSuggestion: currentSuggestions.multiselect,
+      entity: entities.multiselect,
+      expectedErrorMessage: '/values/0/id: must be string',
+    },
+    {
+      case: 'invalid relationship values type',
+      property: properties.relationship,
+      rawSuggestion: {
+        ...validRawSuggestions.relationship,
+        values: 1,
+      },
+      currentSuggestion: currentSuggestions.relationship,
+      entity: entities.relationship,
+      expectedErrorMessage: '/values: must be array',
+    },
+    {
+      case: 'invalid relationship values subtype',
+      property: properties.relationship,
+      rawSuggestion: {
+        ...validRawSuggestions.relationship,
+        values: [{ id: 1, label: 'value_label' }],
+      },
+      currentSuggestion: currentSuggestions.relationship,
+      entity: entities.relationship,
+      expectedErrorMessage: '/values/0/id: must be string',
+    },
+  ])(
+    'should throw error if $case',
+    async ({ property, rawSuggestion, currentSuggestion, entity, expectedErrorMessage }) => {
+      const cb = async () =>
+        formatSuggestion(
+          property,
+          // @ts-expect-error
+          rawSuggestion,
+          currentSuggestion,
+          entity,
+          successMessage
+        );
+      await expect(cb).rejects.toThrow(expectedErrorMessage);
+    }
+  );
+
+  it('should allow extra properties', async () => {
+    const property = properties.text;
+    const rawSuggestion = {
+      ...validRawSuggestions.text,
+      extra: 'extra',
+    };
+    const result = await formatSuggestion(
+      property,
+      rawSuggestion,
+      currentSuggestions.text,
+      entities.text,
+      successMessage
+    );
+    expect(result).toEqual({
+      ...currentSuggestions.text,
+      date: expect.any(Number),
+      suggestedValue: 'recommended_value',
+      segment: 'new context',
+      selectionRectangles: [
+        {
+          top: 0,
+          left: 0,
+          width: 0,
+          height: 0,
+          page: '1',
+        },
+      ],
+    });
+  });
+
+  it.each([
+    {
+      case: 'valid title suggestions',
+      property: { name: 'title' as 'title', type: 'title' as 'title' },
+      rawSuggestion: validRawSuggestions.title,
+      currentSuggestion: currentSuggestions.title,
+      entity: entities.title,
+      expectedResult: {
+        ...currentSuggestions.title,
+        date: expect.any(Number),
+        suggestedValue: 'recommended_value',
+        segment: 'new context',
+        selectionRectangles: [
+          {
+            top: 0,
+            left: 0,
+            width: 0,
+            height: 0,
+            page: '1',
+          },
+        ],
+      },
+    },
+    {
+      case: 'valid text suggestions',
+      property: properties.text,
+      rawSuggestion: validRawSuggestions.text,
+      currentSuggestion: currentSuggestions.text,
+      entity: entities.text,
+      expectedResult: {
+        ...currentSuggestions.text,
+        date: expect.any(Number),
+        suggestedValue: 'recommended_value',
+        segment: 'new context',
+        selectionRectangles: [
+          {
+            top: 0,
+            left: 0,
+            width: 0,
+            height: 0,
+            page: '1',
+          },
+        ],
+      },
+    },
+    {
+      case: 'valid numeric suggestions',
+      property: properties.numeric,
+      rawSuggestion: validRawSuggestions.numeric,
+      currentSuggestion: currentSuggestions.numeric,
+      entity: entities.numeric,
+      expectedResult: {
+        ...currentSuggestions.numeric,
+        date: expect.any(Number),
+        suggestedValue: 42,
+        segment: 'new context',
+        selectionRectangles: [
+          {
+            top: 0,
+            left: 0,
+            width: 0,
+            height: 0,
+            page: '1',
+          },
+        ],
+      },
+    },
+    {
+      case: 'valid date suggestions',
+      property: properties.date,
+      rawSuggestion: validRawSuggestions.date,
+      currentSuggestion: currentSuggestions.date,
+      entity: entities.date,
+      expectedResult: {
+        ...currentSuggestions.date,
+        date: expect.any(Number),
+        suggestedValue: suggestedDateTimeStamp / 1000,
+        suggestedText: suggestedDateText,
+        segment: 'new context',
+        selectionRectangles: [
+          {
+            top: 0,
+            left: 0,
+            width: 0,
+            height: 0,
+            page: '1',
+          },
+        ],
+      },
+    },
+    {
+      case: 'valid select suggestions',
+      property: properties.select,
+      rawSuggestion: validRawSuggestions.select,
+      currentSuggestion: currentSuggestions.select,
+      entity: entities.select,
+      expectedResult: {
+        ...currentSuggestions.select,
+        date: expect.any(Number),
+        suggestedValue: 'B_id',
+        segment: 'new context',
+      },
+    },
+    {
+      case: 'valid multiselect suggestions',
+      property: properties.multiselect,
+      rawSuggestion: validRawSuggestions.multiselect,
+      currentSuggestion: currentSuggestions.multiselect,
+      entity: entities.multiselect,
+      expectedResult: {
+        ...currentSuggestions.multiselect,
+        date: expect.any(Number),
+        suggestedValue: ['C_id', 'D_id'],
+        segment: 'new context',
+      },
+    },
+    {
+      case: 'valid relationship suggestions',
+      property: properties.relationship,
+      rawSuggestion: validRawSuggestions.relationship,
+      currentSuggestion: currentSuggestions.relationship,
+      entity: entities.relationship,
+      expectedResult: {
+        ...currentSuggestions.relationship,
+        date: expect.any(Number),
+        suggestedValue: ['related_1_id', 'related_3_id'],
+        segment: 'new context',
+      },
+    },
+  ])(
+    'should return formatted suggestion for $case',
+    async ({ property, rawSuggestion, currentSuggestion, entity, expectedResult }) => {
+      const result = await formatSuggestion(
+        property,
+        rawSuggestion,
+        currentSuggestion,
+        entity,
+        successMessage
+      );
+      expect(result).toEqual(expectedResult);
+    }
+  );
+});
diff --git a/app/api/services/informationextraction/specs/uploads/segmentation/documentK.xml b/app/api/services/informationextraction/specs/uploads/segmentation/documentK.xml
new file mode 100644
index 0000000000..ff40832804
--- /dev/null
+++ b/app/api/services/informationextraction/specs/uploads/segmentation/documentK.xml
@@ -0,0 +1,3 @@
+<text>
+    K
+</text>
\ No newline at end of file
diff --git a/app/api/services/informationextraction/specs/uploads/segmentation/documentL.xml b/app/api/services/informationextraction/specs/uploads/segmentation/documentL.xml
new file mode 100644
index 0000000000..3d8093bb49
--- /dev/null
+++ b/app/api/services/informationextraction/specs/uploads/segmentation/documentL.xml
@@ -0,0 +1,3 @@
+<text>
+    L
+</text>
\ No newline at end of file
diff --git a/app/api/services/informationextraction/specs/uploads/segmentation/documentM.xml b/app/api/services/informationextraction/specs/uploads/segmentation/documentM.xml
new file mode 100644
index 0000000000..77fe91e68a
--- /dev/null
+++ b/app/api/services/informationextraction/specs/uploads/segmentation/documentM.xml
@@ -0,0 +1,3 @@
+<text>
+    M
+</text>
\ No newline at end of file
diff --git a/app/api/services/informationextraction/suggestionFormatting.ts b/app/api/services/informationextraction/suggestionFormatting.ts
index 919604c768..73839f9f2d 100644
--- a/app/api/services/informationextraction/suggestionFormatting.ts
+++ b/app/api/services/informationextraction/suggestionFormatting.ts
@@ -1,73 +1,168 @@
-import { stringToTypeOfProperty } from 'shared/stringToTypeOfProperty';
+import Ajv from 'ajv';
+
+import date from 'api/utils/date';
 import { PropertySchema } from 'shared/types/commonTypes';
 import { EntitySchema } from 'shared/types/entityType';
-import { IXSuggestionType } from 'shared/types/suggestionType';
+import {
+  CommonSuggestion,
+  IXSuggestionType,
+  TextSelectionSuggestion,
+  ValuesSelectionSuggestion,
+} from 'shared/types/suggestionType';
+import {
+  TextSelectionSuggestionSchema,
+  ValuesSelectionSuggestionSchema,
+} from 'shared/types/suggestionSchema';
+import { syncWrapValidator } from 'shared/tsUtils';
 import { InternalIXResultsMessage } from './InformationExtraction';
+import { AllowedPropertyTypes, checkTypeIsAllowed } from './ixextractors';
 
-interface CommonSuggestion {
-  tenant: string;
-  id: string;
-  xml_file_name: string;
-}
+type RawSuggestion = TextSelectionSuggestion | ValuesSelectionSuggestion;
 
-interface TextSelectionSuggestion extends CommonSuggestion {
-  text: string;
-  segment_text: string;
-  segments_boxes: {
-    top: number;
-    left: number;
-    width: number;
-    height: number;
-    page_number: number;
-  }[];
+class RawSuggestionValidationError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'RawSuggestionValidationError';
+  }
 }
 
-interface ValuesSelectionSuggestion extends CommonSuggestion {
-  values: { id: string; label: string }[];
-  segment_text: string;
-}
+type TitleAsProperty = {
+  name: 'title';
+  type: 'title';
+};
 
-type RawSuggestion = TextSelectionSuggestion | ValuesSelectionSuggestion;
+const createAjvValidator = (schema: any) => {
+  const ajv = new Ajv({ allErrors: true });
+  ajv.addVocabulary(['tsType']);
+  return syncWrapValidator(ajv.compile(schema));
+};
+
+const textSelectionAjv = createAjvValidator(TextSelectionSuggestionSchema);
+const valuesSelectionAjv = createAjvValidator(ValuesSelectionSuggestionSchema);
+
+const textSelectionValidator = (
+  suggestion: RawSuggestion
+): suggestion is TextSelectionSuggestion => {
+  textSelectionAjv(suggestion);
+  return true;
+};
+
+const valuesSelectionValidator = (
+  suggestion: RawSuggestion
+): suggestion is ValuesSelectionSuggestion => {
+  valuesSelectionAjv(suggestion);
+  return true;
+};
 
 const VALIDATORS = {
-  text: (suggestion: RawSuggestion): suggestion is TextSelectionSuggestion => 'text' in suggestion,
-  select: (suggestion: RawSuggestion): suggestion is ValuesSelectionSuggestion =>
-    'values' in suggestion && (suggestion.values.length === 1 || suggestion.values.length === 0),
-  multiselect: (suggestion: RawSuggestion): suggestion is ValuesSelectionSuggestion =>
-    'values' in suggestion,
+  title: textSelectionValidator,
+  text: textSelectionValidator,
+  numeric: textSelectionValidator,
+  date: textSelectionValidator,
+  select: (suggestion: RawSuggestion): suggestion is ValuesSelectionSuggestion => {
+    if (!valuesSelectionValidator(suggestion)) {
+      throw new RawSuggestionValidationError('Select suggestion is not valid.');
+    }
+
+    if (!('values' in suggestion) || suggestion.values.length > 1) {
+      throw new RawSuggestionValidationError('Select suggestions must have one or zero values.');
+    }
+
+    return true;
+  },
+  multiselect: valuesSelectionValidator,
+  relationship: valuesSelectionValidator,
+};
+
+const simpleSuggestion = (
+  suggestedValue: string | number | null,
+  rawSuggestion: TextSelectionSuggestion
+) => ({
+  suggestedValue,
+  segment: rawSuggestion.segment_text,
+  selectionRectangles: rawSuggestion.segments_boxes.map((box: any) => {
+    const rect = { ...box, page: box.page_number.toString() };
+    delete rect.page_number;
+    return rect;
+  }),
+});
+
+function multiValueIdsSuggestion(rawSuggestion: ValuesSelectionSuggestion) {
+  const suggestedValue = rawSuggestion.values.map(value => value.id);
+
+  const suggestion: Partial<IXSuggestionType> = {
+    suggestedValue,
+    segment: rawSuggestion.segment_text,
+  };
+  return suggestion;
+}
+
+const textFormatter = (
+  rawSuggestion: RawSuggestion,
+  _currentSuggestion: IXSuggestionType,
+  _entity: EntitySchema
+) => {
+  if (!VALIDATORS.text(rawSuggestion)) {
+    throw new Error('Text suggestion is not valid.');
+  }
+
+  const rawText = rawSuggestion.text;
+  const suggestedValue = rawText.trim();
+
+  const suggestion: Partial<IXSuggestionType> = simpleSuggestion(suggestedValue, rawSuggestion);
+
+  return suggestion;
 };
 
-const FORMATTERS = {
-  text: (
+const FORMATTERS: Record<
+  AllowedPropertyTypes,
+  (
+    rawSuggestion: RawSuggestion,
+    currentSuggestion: IXSuggestionType,
+    entity: EntitySchema
+  ) => Partial<IXSuggestionType>
+> = {
+  title: textFormatter,
+  text: textFormatter,
+  numeric: (
+    rawSuggestion: RawSuggestion,
+    _currentSuggestion: IXSuggestionType,
+    _entity: EntitySchema
+  ) => {
+    if (!VALIDATORS.numeric(rawSuggestion)) {
+      throw new Error('Numeric suggestion is not valid.');
+    }
+
+    const suggestedValue = parseFloat(rawSuggestion.text.trim()) || null;
+    const suggestion: Partial<IXSuggestionType> = simpleSuggestion(suggestedValue, rawSuggestion);
+
+    return suggestion;
+  },
+  date: (
     rawSuggestion: RawSuggestion,
-    property: PropertySchema | undefined,
     currentSuggestion: IXSuggestionType,
     entity: EntitySchema
   ) => {
-    if (!VALIDATORS.text(rawSuggestion)) {
-      throw new Error('Text suggestion is not valid.');
+    if (!VALIDATORS.date(rawSuggestion)) {
+      throw new Error('Date suggestion is not valid.');
     }
 
-    const suggestedValue = stringToTypeOfProperty(
-      rawSuggestion.text,
-      property?.type,
+    const suggestedValue = date.dateToSeconds(
+      rawSuggestion.text.trim(),
       currentSuggestion?.language || entity.language
     );
-
     const suggestion: Partial<IXSuggestionType> = {
-      suggestedValue,
-      ...(property?.type === 'date' ? { suggestedText: rawSuggestion.text } : {}),
-      segment: rawSuggestion.segment_text,
-      selectionRectangles: rawSuggestion.segments_boxes.map((box: any) => {
-        const rect = { ...box, page: box.page_number.toString() };
-        delete rect.page_number;
-        return rect;
-      }),
+      ...simpleSuggestion(suggestedValue, rawSuggestion),
+      suggestedText: rawSuggestion.text,
     };
 
     return suggestion;
   },
-  select: (rawSuggestion: RawSuggestion) => {
+  select: (
+    rawSuggestion: RawSuggestion,
+    _currentSuggestion: IXSuggestionType,
+    _entity: EntitySchema
+  ) => {
     if (!VALIDATORS.select(rawSuggestion)) {
       throw new Error('Select suggestion is not valid.');
     }
@@ -81,46 +176,57 @@ const FORMATTERS = {
 
     return suggestion;
   },
-  multiselect: (rawSuggestion: RawSuggestion) => {
+  multiselect: (
+    rawSuggestion: RawSuggestion,
+    _currentSuggestion: IXSuggestionType,
+    _entity: EntitySchema
+  ) => {
     if (!VALIDATORS.multiselect(rawSuggestion)) {
       throw new Error('Multiselect suggestion is not valid.');
     }
 
-    const suggestedValue = rawSuggestion.values.map(value => value.id);
+    const suggestion: Partial<IXSuggestionType> = multiValueIdsSuggestion(rawSuggestion);
 
-    const suggestion: Partial<IXSuggestionType> = {
-      suggestedValue,
-      segment: rawSuggestion.segment_text,
-    };
+    return suggestion;
+  },
+  relationship: (
+    rawSuggestion: RawSuggestion,
+    _currentSuggestion: IXSuggestionType,
+    _entity: EntitySchema
+  ) => {
+    if (!VALIDATORS.relationship(rawSuggestion)) {
+      throw new Error('Relationship suggestion is not valid.');
+    }
+
+    const suggestion: Partial<IXSuggestionType> = multiValueIdsSuggestion(rawSuggestion);
 
     return suggestion;
   },
 };
 
-const DEFAULTFORMATTER = FORMATTERS.text;
+type PropertyOrTitle = PropertySchema | TitleAsProperty | undefined;
 
 const formatRawSuggestion = (
   rawSuggestion: RawSuggestion,
-  property: PropertySchema | undefined,
+  property: PropertyOrTitle,
   currentSuggestion: IXSuggestionType,
   entity: EntitySchema
 ) => {
-  const formatter =
-    // @ts-ignore
-    (property?.type || '') in FORMATTERS ? FORMATTERS[property.type] : DEFAULTFORMATTER;
-  return formatter(rawSuggestion, property, currentSuggestion, entity);
+  const type = checkTypeIsAllowed(property?.type || '');
+  const formatter = FORMATTERS[type];
+  return formatter(rawSuggestion, currentSuggestion, entity);
 };
 
 const readMessageSuccess = (message: InternalIXResultsMessage) =>
   message.success
     ? {}
     : {
-        status: 'failed',
+        status: 'failed' as 'failed',
         error: message.error_message ? message.error_message : 'Unknown error',
       };
 
 const formatSuggestion = async (
-  property: PropertySchema | undefined,
+  property: PropertyOrTitle,
   rawSuggestion: RawSuggestion,
   currentSuggestion: IXSuggestionType,
   entity: EntitySchema,
diff --git a/app/api/suggestions/specs/fixtures.ts b/app/api/suggestions/specs/fixtures.ts
index 32e81655cd..42b54dfbc2 100644
--- a/app/api/suggestions/specs/fixtures.ts
+++ b/app/api/suggestions/specs/fixtures.ts
@@ -1407,6 +1407,320 @@ const selectAcceptanceFixtureBase: DBFixture = {
   ],
 };
 
+const relationshipAcceptanceFixtureBase: DBFixture = {
+  settings: _.cloneDeep(ixSettings),
+  ixextractors: [
+    factory.ixExtractor('relationship_extractor', 'relationship_to_source', ['rel_template']),
+    factory.ixExtractor(
+      'relationship_with_inheritance_extractor',
+      'relationship_with_inheritance',
+      ['rel_template']
+    ),
+    factory.ixExtractor('relationship_to_any_extractor', 'relationship_to_any', ['rel_template']),
+  ],
+  ixsuggestions: [],
+  ixmodels: [
+    {
+      _id: testingDB.id(),
+      status: 'ready',
+      creationDate: 1,
+      extractorId: factory.id('relationship_extractor'),
+    },
+    {
+      _id: testingDB.id(),
+      status: 'ready',
+      creationDate: 1,
+      extractorId: factory.id('relationship_with_inheritance_extractor'),
+    },
+    {
+      _id: testingDB.id(),
+      status: 'ready',
+      creationDate: 1,
+      extractorId: factory.id('relationship_to_any_extractor'),
+    },
+  ],
+  relationtypes: [
+    factory.relationType('related'),
+    factory.relationType('related_with_inheritance'),
+    factory.relationType('related_to_any'),
+  ],
+  templates: [
+    factory.template('source_template', [factory.property('text_to_inherit', 'text')]),
+    factory.template('source_template_2', []),
+    factory.template('rel_template', [
+      factory.property('relationship_to_source', 'relationship', {
+        content: factory.idString('source_template'),
+        relationType: factory.idString('related'),
+      }),
+      factory.property('relationship_with_inheritance', 'relationship', {
+        content: factory.idString('source_template'),
+        relationType: factory.idString('related_with_inheritance'),
+        inherit: {
+          property: factory.idString('text_to_inherit'),
+          type: 'text',
+        },
+      }),
+      factory.property('relationship_to_any', 'relationship', {
+        content: '',
+        relationType: factory.idString('related_to_any'),
+      }),
+    ]),
+  ],
+  entities: [
+    // ---------- sources
+    {
+      _id: testingDB.id(),
+      sharedId: 'S1_sId',
+      title: 'S1',
+      language: 'en',
+      metadata: { text_to_inherit: [{ value: 'inherited text' }] },
+      template: factory.id('source_template'),
+    },
+    {
+      _id: testingDB.id(),
+      sharedId: 'S1_sId',
+      title: 'S1_es',
+      language: 'es',
+      metadata: { text_to_inherit: [{ value: 'inherited text Spanish' }] },
+      template: factory.id('source_template'),
+    },
+    {
+      _id: testingDB.id(),
+      sharedId: 'S2_sId',
+      title: 'S2',
+      language: 'en',
+      metadata: { text_to_inherit: [{ value: 'inherited text 2' }] },
+      template: factory.id('source_template'),
+    },
+    {
+      _id: testingDB.id(),
+      sharedId: 'S2_sId',
+      title: 'S2_es',
+      language: 'es',
+      metadata: { text_to_inherit: [{ value: 'inherited text 2 Spanish' }] },
+      template: factory.id('source_template'),
+    },
+    {
+      _id: testingDB.id(),
+      sharedId: 'S3_sId',
+      title: 'S3',
+      language: 'en',
+      metadata: { text_to_inherit: [{ value: 'inherited text 3' }] },
+      template: factory.id('source_template'),
+    },
+    {
+      _id: testingDB.id(),
+      sharedId: 'S3_sId',
+      title: 'S3_es',
+      language: 'es',
+      metadata: { text_to_inherit: [{ value: 'inherited text 3 Spanish' }] },
+      template: factory.id('source_template'),
+    },
+    // ---------- other sources
+    {
+      _id: testingDB.id(),
+      sharedId: 'other_source',
+      title: 'Other Source',
+      language: 'en',
+      metadata: {},
+      template: factory.id('source_template_2'),
+    },
+    {
+      _id: testingDB.id(),
+      sharedId: 'other_source',
+      title: 'Other Source Spanish',
+      language: 'es',
+      metadata: {},
+      template: factory.id('source_template_2'),
+    },
+    {
+      _id: testingDB.id(),
+      sharedId: 'other_source_2',
+      title: 'Other Source 2',
+      language: 'en',
+      metadata: {},
+      template: factory.id('source_template_2'),
+    },
+    {
+      _id: testingDB.id(),
+      sharedId: 'other_source_2',
+      title: 'Other Source 2 Spanish',
+      language: 'es',
+      metadata: {},
+      template: factory.id('source_template_2'),
+    },
+    // ---------- with relationship
+    {
+      _id: testingDB.id(),
+      sharedId: 'entityWithRelationships_sId',
+      title: 'entityWithRelationships',
+      language: 'en',
+      metadata: {
+        relationship_to_source: [
+          { value: 'S1_sId', label: 'S1' },
+          { value: 'S2_sId', label: 'S2' },
+        ],
+        relationship_with_inheritance: [
+          {
+            value: 'S1_sId',
+            label: 'S1',
+            inheritedType: 'text',
+            inheritedValue: [
+              {
+                value: 'inherited text',
+              },
+            ],
+          },
+          {
+            value: 'S2_sId',
+            label: 'S2',
+            inheritedType: 'text',
+            inheritedValue: [
+              {
+                value: 'inherited text 2',
+              },
+            ],
+          },
+        ],
+        relationship_to_any: [
+          {
+            value: 'S1_sId',
+            label: 'S1',
+          },
+          {
+            value: 'other_source',
+            label: 'Other Source',
+          },
+        ],
+      },
+      template: factory.id('rel_template'),
+    },
+    {
+      _id: testingDB.id(),
+      sharedId: 'entityWithRelationships_sId',
+      title: 'entityWithRelationshipsEs',
+      language: 'es',
+      metadata: {
+        relationship_to_source: [
+          { value: 'S1_sId', label: 'S1_es' },
+          { value: 'S2_sId', label: 'S2_es' },
+        ],
+        relationship_with_inheritance: [
+          {
+            value: 'S1_sId',
+            label: 'S1_es',
+            inheritedType: 'text',
+            inheritedValue: [
+              {
+                value: 'inherited text Spanish',
+              },
+            ],
+          },
+          {
+            value: 'S2_sId',
+            label: 'S2_es',
+            inheritedType: 'text',
+            inheritedValue: [
+              {
+                value: 'inherited text 2 Spanish',
+              },
+            ],
+          },
+        ],
+        relationship_to_any: [
+          {
+            value: 'S1_sId',
+            label: 'S1_es',
+          },
+          {
+            value: 'other_source',
+            label: 'Other Source Spanish',
+          },
+        ],
+      },
+      template: factory.id('rel_template'),
+    },
+  ],
+  connections: [
+    {
+      _id: testingDB.id(),
+      entity: 'entityWithRelationships_sId',
+      hub: factory.id('hub_S1'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'S1_sId',
+      hub: factory.id('hub_S1'),
+      template: factory.id('related'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'entityWithRelationships_sId',
+      hub: factory.id('hub_S2'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'S2_sId',
+      hub: factory.id('hub_S2'),
+      template: factory.id('related'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'entityWithRelationships_sId',
+      hub: factory.id('hub_S1_inherited'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'S1_sId',
+      hub: factory.id('hub_S1_inherited'),
+      template: factory.id('related_with_inheritance'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'entityWithRelationships_sId',
+      hub: factory.id('hub_S2_inherited'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'S2_sId',
+      hub: factory.id('hub_S2_inherited'),
+      template: factory.id('related_with_inheritance'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'entityWithRelationships_sId',
+      hub: factory.id('hub_S1_any'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'S1_sId',
+      hub: factory.id('hub_S1_any'),
+      template: factory.id('related_to_any'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'entityWithRelationships_sId',
+      hub: factory.id('hub_other_source_any'),
+    },
+    {
+      _id: testingDB.id(),
+      entity: 'other_source',
+      hub: factory.id('hub_other_source_any'),
+      template: factory.id('related_to_any'),
+    },
+  ],
+  files: [
+    factory.file(
+      'fileForEntityWithRelationships',
+      'entityWithRelationships_sId',
+      'document',
+      'documentWithRelationships.pdf',
+      'eng',
+      'documentWithRelationships.pdf'
+    ),
+  ],
+};
+
 export {
   factory,
   file2Id,
@@ -1423,4 +1737,5 @@ export {
   suggestionId,
   shared2AgeSuggestionId,
   selectAcceptanceFixtureBase,
+  relationshipAcceptanceFixtureBase,
 };
diff --git a/app/api/suggestions/specs/routes.spec.ts b/app/api/suggestions/specs/routes.spec.ts
index 40e0e0d18c..10bc43cf2a 100644
--- a/app/api/suggestions/specs/routes.spec.ts
+++ b/app/api/suggestions/specs/routes.spec.ts
@@ -393,10 +393,7 @@ describe('suggestions routes', () => {
           title: 'The Penguin',
         },
       ]);
-      expect(search.indexEntities).toHaveBeenCalledWith(
-        { _id: { $in: [shared6enId] } },
-        '+fullText'
-      );
+      expect(search.indexEntities).toHaveBeenCalledWith({ sharedId: 'shared6' }, '+fullText');
     });
 
     it('should reject with unauthorized when user has not admin role', async () => {
@@ -434,10 +431,10 @@ describe('suggestions routes', () => {
       const [entity] = await entities.get({ sharedId: 'entityWithSelects2' });
       expect(entity.metadata.property_multiselect).toEqual([
         { value: 'A', label: 'A' },
-        { value: '1B', label: '1B' },
+        { value: '1B', label: '1B', parent: { value: '1', label: '1' } },
       ]);
       expect(search.indexEntities).toHaveBeenCalledWith(
-        { _id: { $in: [factory.id('entityWithSelects2')] } },
+        { sharedId: 'entityWithSelects2' },
         '+fullText'
       );
     });
diff --git a/app/api/suggestions/specs/suggestions.spec.ts b/app/api/suggestions/specs/suggestions.spec.ts
index 2fa5c756f6..fcf5135583 100644
--- a/app/api/suggestions/specs/suggestions.spec.ts
+++ b/app/api/suggestions/specs/suggestions.spec.ts
@@ -18,7 +18,9 @@ import {
   suggestionId,
   shared2AgeSuggestionId,
   selectAcceptanceFixtureBase,
+  relationshipAcceptanceFixtureBase,
 } from './fixtures';
+import { ObjectId } from 'mongodb';
 
 const getSuggestions = async (filter: IXSuggestionsFilter, size = 5) =>
   Suggestions.get(filter, { page: { size, number: 1 } });
@@ -346,18 +348,20 @@ const matchState = (match: boolean = true): IXSuggestionStateType => ({
   error: false,
 });
 
-const selectSuggestionBase = (propertyName: string, extractorName: string) => ({
-  fileId: factory.id('fileForentityWithSelects'),
-  entityId: 'entityWithSelects',
-  entityTemplate: factory.id('templateWithSelects').toString(),
-  propertyName,
-  extractorId: factory.id(extractorName),
-  date: 5,
-  status: 'ready' as 'ready',
-  error: '',
-});
+type SuggestionBase = Pick<
+  IXSuggestionType,
+  | 'fileId'
+  | 'entityId'
+  | 'entityTemplate'
+  | 'propertyName'
+  | 'extractorId'
+  | 'date'
+  | 'status'
+  | 'error'
+>;
 
 const prepareAndAcceptSuggestion = async (
+  suggestionBase: SuggestionBase,
   suggestedValue: string | string[],
   language: string,
   propertyName: string,
@@ -368,7 +372,7 @@ const prepareAndAcceptSuggestion = async (
   } = {}
 ) => {
   const suggestion = {
-    ...selectSuggestionBase(propertyName, extractorName),
+    ...suggestionBase,
     suggestedValue,
     language,
   };
@@ -387,6 +391,69 @@ const prepareAndAcceptSuggestion = async (
   return { acceptedSuggestion, metadataValues, allFiles };
 };
 
+const selectSuggestionBase = (propertyName: string, extractorName: string): SuggestionBase => ({
+  fileId: factory.id('fileForentityWithSelects'),
+  entityId: 'entityWithSelects',
+  entityTemplate: factory.id('templateWithSelects').toString(),
+  propertyName,
+  extractorId: factory.id(extractorName),
+  date: 5,
+  status: 'ready' as 'ready',
+  error: '',
+});
+
+const prepareAndAcceptSelectSuggestion = async (
+  suggestedValue: string | string[],
+  language: string,
+  propertyName: string,
+  extractorName: string,
+  acceptanceParameters: {
+    addedValues?: string[];
+    removedValues?: string[];
+  } = {}
+) =>
+  prepareAndAcceptSuggestion(
+    selectSuggestionBase(propertyName, extractorName),
+    suggestedValue,
+    language,
+    propertyName,
+    extractorName,
+    acceptanceParameters
+  );
+
+const relationshipSuggestionBase = (
+  propertyName: string,
+  extractorName: string
+): SuggestionBase => ({
+  fileId: factory.id('fileForEntityWithRelationships'),
+  entityId: 'entityWithRelationships_sId',
+  entityTemplate: factory.id('rel_template').toString(),
+  propertyName,
+  extractorId: factory.id(extractorName),
+  date: 5,
+  status: 'ready' as 'ready',
+  error: '',
+});
+
+const prepareAndAcceptRelationshipSuggestion = async (
+  suggestedValue: string | string[],
+  language: string,
+  propertyName: string,
+  extractorName: string,
+  acceptanceParameters: {
+    addedValues?: string[];
+    removedValues?: string[];
+  } = {}
+) =>
+  prepareAndAcceptSuggestion(
+    relationshipSuggestionBase(propertyName, extractorName),
+    suggestedValue,
+    language,
+    propertyName,
+    extractorName,
+    acceptanceParameters
+  );
+
 describe('suggestions', () => {
   afterAll(async () => {
     await db.disconnect();
@@ -828,14 +895,14 @@ describe('suggestions', () => {
           .find({ sharedId: 'shared1' })
           .toArray();
         const ages1 = entities1?.map(entity => entity.metadata.age[0].value);
-        expect(ages1).toEqual(['17', '17']);
+        expect(ages1).toEqual([17, 17]);
 
         const entities2 = await db.mongodb
           ?.collection('entities')
           .find({ sharedId: 'shared2' })
           .toArray();
         const ages2 = entities2?.map(entity => entity.metadata.age[0].value);
-        expect(ages2).toEqual(['20', '20', '20']);
+        expect(ages2).toEqual([20, 20, 20]);
       });
     });
 
@@ -846,18 +913,14 @@ describe('suggestions', () => {
 
       it('should validate that the id exists in the dictionary', async () => {
         const action = async () => {
-          await prepareAndAcceptSuggestion('Z', 'en', 'property_select', 'select_extractor');
+          await prepareAndAcceptSelectSuggestion('Z', 'en', 'property_select', 'select_extractor');
         };
         await expect(action()).rejects.toThrow('Id is invalid: Z (Nested Thesaurus).');
       });
 
       it('should update entities of all languages, with the properly translated labels', async () => {
-        const { acceptedSuggestion, metadataValues, allFiles } = await prepareAndAcceptSuggestion(
-          'A',
-          'en',
-          'property_select',
-          'select_extractor'
-        );
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptSelectSuggestion('A', 'en', 'property_select', 'select_extractor');
         expect(acceptedSuggestion.state).toEqual(matchState());
         expect(metadataValues).toMatchObject([
           [{ value: 'A', label: 'A' }],
@@ -874,7 +937,7 @@ describe('suggestions', () => {
 
       it('should validate that the ids exist in the dictionary', async () => {
         const action = async () => {
-          await prepareAndAcceptSuggestion(
+          await prepareAndAcceptSelectSuggestion(
             ['Z', '1A', 'Y', 'A'],
             'en',
             'property_multiselect',
@@ -884,29 +947,41 @@ describe('suggestions', () => {
         await expect(action()).rejects.toThrow('Ids are invalid: Z, Y (Nested Thesaurus).');
       });
 
-      it('should validate that partial acceptance is allowed only for multiselects', async () => {
+      it('should validate that partial acceptance is allowed only for multiselects/relationships', async () => {
         const addAction = async () => {
-          await prepareAndAcceptSuggestion('1A', 'en', 'property_select', 'select_extractor', {
-            addedValues: ['1A'],
-          });
+          await prepareAndAcceptSelectSuggestion(
+            '1A',
+            'en',
+            'property_select',
+            'select_extractor',
+            {
+              addedValues: ['1A'],
+            }
+          );
         };
         await expect(addAction()).rejects.toThrow(
-          'Partial acceptance is only allowed for multiselects.'
+          'Partial acceptance is only allowed for multiselects or relationships.'
         );
 
         const removeAction = async () => {
-          await prepareAndAcceptSuggestion('1A', 'en', 'property_select', 'select_extractor', {
-            removedValues: ['1B'],
-          });
+          await prepareAndAcceptSelectSuggestion(
+            '1A',
+            'en',
+            'property_select',
+            'select_extractor',
+            {
+              removedValues: ['1B'],
+            }
+          );
         };
         await expect(removeAction()).rejects.toThrow(
-          'Partial acceptance is only allowed for multiselects.'
+          'Partial acceptance is only allowed for multiselects or relationships.'
         );
       });
 
       it("should validate that the accepted id's through partial acceptance do exist on the suggestion", async () => {
         const action = async () => {
-          await prepareAndAcceptSuggestion(
+          await prepareAndAcceptSelectSuggestion(
             ['1A', '1B'],
             'en',
             'property_multiselect',
@@ -923,7 +998,7 @@ describe('suggestions', () => {
 
       it("should validate that the id's to remove through partial acceptance do not exist on the suggestion", async () => {
         const action = async () => {
-          await prepareAndAcceptSuggestion(
+          await prepareAndAcceptSelectSuggestion(
             ['1A', '1B'],
             'en',
             'property_multiselect',
@@ -939,12 +1014,13 @@ describe('suggestions', () => {
       });
 
       it('should allow full acceptance, and update entites of all languages, with the properly translated labels', async () => {
-        const { acceptedSuggestion, metadataValues, allFiles } = await prepareAndAcceptSuggestion(
-          ['1A', '1B'],
-          'en',
-          'property_multiselect',
-          'multiselect_extractor'
-        );
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptSelectSuggestion(
+            ['1A', '1B'],
+            'en',
+            'property_multiselect',
+            'multiselect_extractor'
+          );
         expect(acceptedSuggestion.state).toEqual(matchState());
         expect(metadataValues).toMatchObject([
           [
@@ -960,15 +1036,16 @@ describe('suggestions', () => {
       });
 
       it('should allow partial acceptance, and update entites of all languages, with the properly translated labels', async () => {
-        const { acceptedSuggestion, metadataValues, allFiles } = await prepareAndAcceptSuggestion(
-          ['B', '1B'],
-          'en',
-          'property_multiselect',
-          'multiselect_extractor',
-          {
-            addedValues: ['B'],
-          }
-        );
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptSelectSuggestion(
+            ['B', '1B'],
+            'en',
+            'property_multiselect',
+            'multiselect_extractor',
+            {
+              addedValues: ['B'],
+            }
+          );
         expect(acceptedSuggestion.state).toEqual(matchState(false));
         expect(metadataValues).toMatchObject([
           [
@@ -986,15 +1063,16 @@ describe('suggestions', () => {
       });
 
       it('should do nothing on partial acceptance if the id is already in the entity metadata', async () => {
-        const { acceptedSuggestion, metadataValues, allFiles } = await prepareAndAcceptSuggestion(
-          ['1A', '1B'],
-          'en',
-          'property_multiselect',
-          'multiselect_extractor',
-          {
-            addedValues: ['1A'],
-          }
-        );
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptSelectSuggestion(
+            ['1A', '1B'],
+            'en',
+            'property_multiselect',
+            'multiselect_extractor',
+            {
+              addedValues: ['1A'],
+            }
+          );
         expect(acceptedSuggestion.state).toEqual(matchState(false));
         expect(metadataValues).toMatchObject([
           [
@@ -1010,15 +1088,16 @@ describe('suggestions', () => {
       });
 
       it('should allow removal through partial acceptance, and update entities of all languages', async () => {
-        const { acceptedSuggestion, metadataValues, allFiles } = await prepareAndAcceptSuggestion(
-          ['1A', '1B'],
-          'en',
-          'property_multiselect',
-          'multiselect_extractor',
-          {
-            removedValues: ['A'],
-          }
-        );
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptSelectSuggestion(
+            ['1A', '1B'],
+            'en',
+            'property_multiselect',
+            'multiselect_extractor',
+            {
+              removedValues: ['A'],
+            }
+          );
         expect(acceptedSuggestion.state).toEqual(matchState(false));
         expect(metadataValues).toMatchObject([
           [{ value: '1A', label: '1A' }],
@@ -1028,15 +1107,16 @@ describe('suggestions', () => {
       });
 
       it('should do nothing on removal through partial acceptance if the id is not in the entity metadata', async () => {
-        const { acceptedSuggestion, metadataValues, allFiles } = await prepareAndAcceptSuggestion(
-          ['1A', 'A'],
-          'en',
-          'property_multiselect',
-          'multiselect_extractor',
-          {
-            removedValues: ['B'],
-          }
-        );
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptSelectSuggestion(
+            ['1A', 'A'],
+            'en',
+            'property_multiselect',
+            'multiselect_extractor',
+            {
+              removedValues: ['B'],
+            }
+          );
         expect(acceptedSuggestion.state).toEqual(matchState());
         expect(metadataValues).toMatchObject([
           [
@@ -1051,6 +1131,328 @@ describe('suggestions', () => {
         expect(allFiles).toEqual(selectAcceptanceFixtureBase.files);
       });
     });
+
+    describe('relationship', () => {
+      beforeEach(async () => {
+        await db.setupFixturesAndContext(relationshipAcceptanceFixtureBase);
+      });
+
+      it('should validate that the entities in the suggestion exist', async () => {
+        const action = async () => {
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'X_sId', 'S2_sId', 'Y_sId'],
+            'en',
+            'relationship_to_source',
+            'relationship_extractor'
+          );
+        };
+        await expect(action()).rejects.toThrow(
+          'The following sharedIds do not exist in the database: X_sId, Y_sId.'
+        );
+      });
+
+      it("should validate that the accepted id's through partial acceptance do exist on the suggestion", async () => {
+        const action = async () => {
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'S2_sId'],
+            'en',
+            'relationship_to_source',
+            'relationship_extractor',
+            {
+              addedValues: ['S1_sId', 'X_sId', 'Y_sId'],
+            }
+          );
+        };
+        await expect(action()).rejects.toThrow(
+          'Some of the accepted values do not exist in the suggestion: X_sId, Y_sId. Cannot accept values that are not suggested.'
+        );
+      });
+
+      it("should validate that the id's to remove through partial acceptance do not exist on the suggestion", async () => {
+        const action = async () => {
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'S2_sId'],
+            'en',
+            'relationship_to_source',
+            'relationship_extractor',
+            {
+              removedValues: ['S1_sId', 'S0_sId'],
+            }
+          );
+        };
+        await expect(action()).rejects.toThrow(
+          'Some of the removed values exist in the suggestion: S1_sId. Cannot remove values that are suggested.'
+        );
+      });
+
+      it('should allow full acceptance, and update entites of all languages, with the properly translated labels', async () => {
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'S3_sId'],
+            'en',
+            'relationship_to_source',
+            'relationship_extractor'
+          );
+        expect(acceptedSuggestion.state).toEqual(matchState(true));
+        expect(metadataValues).toMatchObject([
+          [
+            { value: 'S1_sId', label: 'S1' },
+            { value: 'S3_sId', label: 'S3' },
+          ],
+          [
+            { value: 'S1_sId', label: 'S1_es' },
+            { value: 'S3_sId', label: 'S3_es' },
+          ],
+        ]);
+        expect(allFiles).toEqual(relationshipAcceptanceFixtureBase.files);
+      });
+
+      it('should allow partial acceptance, and update entites of all languages, with the properly translated labels', async () => {
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'S3_sId'],
+            'en',
+            'relationship_to_source',
+            'relationship_extractor',
+            {
+              addedValues: ['S3_sId'],
+            }
+          );
+        expect(acceptedSuggestion.state).toEqual(matchState(false));
+        expect(metadataValues).toMatchObject([
+          [
+            { value: 'S1_sId', label: 'S1' },
+            { value: 'S2_sId', label: 'S2' },
+            { value: 'S3_sId', label: 'S3' },
+          ],
+          [
+            { value: 'S1_sId', label: 'S1_es' },
+            { value: 'S2_sId', label: 'S2_es' },
+            { value: 'S3_sId', label: 'S3_es' },
+          ],
+        ]);
+        expect(allFiles).toEqual(relationshipAcceptanceFixtureBase.files);
+      });
+
+      it('should do nothing on partial acceptance if the id is already in the entity metadata', async () => {
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'S3_sId'],
+            'en',
+            'relationship_to_source',
+            'relationship_extractor',
+            {
+              addedValues: ['S1_sId'],
+            }
+          );
+        expect(acceptedSuggestion.state).toEqual(matchState(false));
+        expect(metadataValues).toMatchObject([
+          [
+            { value: 'S1_sId', label: 'S1' },
+            { value: 'S2_sId', label: 'S2' },
+          ],
+          [
+            { value: 'S1_sId', label: 'S1_es' },
+            { value: 'S2_sId', label: 'S2_es' },
+          ],
+        ]);
+        expect(allFiles).toEqual(relationshipAcceptanceFixtureBase.files);
+      });
+
+      it('should allow removal through partial acceptance, and update entities of all languages', async () => {
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'S3_sId'],
+            'en',
+            'relationship_to_source',
+            'relationship_extractor',
+            {
+              removedValues: ['S2_sId'],
+            }
+          );
+        expect(acceptedSuggestion.state).toEqual(matchState(false));
+        expect(metadataValues).toMatchObject([
+          [{ value: 'S1_sId', label: 'S1' }],
+          [{ value: 'S1_sId', label: 'S1_es' }],
+        ]);
+        expect(allFiles).toEqual(relationshipAcceptanceFixtureBase.files);
+      });
+
+      it('should do nothing on removal through partial acceptance if the id is not in the entity metadata', async () => {
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'S2_sId'],
+            'en',
+            'relationship_to_source',
+            'relationship_extractor',
+            {
+              removedValues: ['S3_sId'],
+            }
+          );
+        expect(acceptedSuggestion.state).toEqual(matchState(true));
+        expect(metadataValues).toMatchObject([
+          [
+            { value: 'S1_sId', label: 'S1' },
+            { value: 'S2_sId', label: 'S2' },
+          ],
+          [
+            { value: 'S1_sId', label: 'S1_es' },
+            { value: 'S2_sId', label: 'S2_es' },
+          ],
+        ]);
+        expect(allFiles).toEqual(relationshipAcceptanceFixtureBase.files);
+      });
+
+      it('should update inherited values per language', async () => {
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'S3_sId'],
+            'en',
+            'relationship_with_inheritance',
+            'relationship_with_inheritance_extractor'
+          );
+        expect(acceptedSuggestion.state).toEqual(matchState(true));
+        expect(metadataValues).toMatchObject([
+          [
+            {
+              value: 'S1_sId',
+              label: 'S1',
+              inheritedType: 'text',
+              inheritedValue: [
+                {
+                  value: 'inherited text',
+                },
+              ],
+            },
+            {
+              value: 'S3_sId',
+              label: 'S3',
+              inheritedType: 'text',
+              inheritedValue: [
+                {
+                  value: 'inherited text 3',
+                },
+              ],
+            },
+          ],
+          [
+            {
+              value: 'S1_sId',
+              label: 'S1_es',
+              inheritedType: 'text',
+              inheritedValue: [
+                {
+                  value: 'inherited text Spanish',
+                },
+              ],
+            },
+            {
+              value: 'S3_sId',
+              label: 'S3_es',
+              inheritedType: 'text',
+              inheritedValue: [
+                {
+                  value: 'inherited text 3 Spanish',
+                },
+              ],
+            },
+          ],
+        ]);
+        expect(allFiles).toEqual(relationshipAcceptanceFixtureBase.files);
+      });
+
+      it('should check if the suggested entities are of the correct template', async () => {
+        const action = async () => {
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'other_source'],
+            'en',
+            'relationship_to_source',
+            'relationship_extractor'
+          );
+        };
+        await expect(action()).rejects.toThrow(
+          'The following sharedIds do not match the content template in the relationship property: other_source.'
+        );
+      });
+
+      it('should handle relationship properties with any template as content', async () => {
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S2_sId', 'other_source_2'],
+            'en',
+            'relationship_to_any',
+            'relationship_to_any_extractor'
+          );
+        expect(acceptedSuggestion.state).toEqual(matchState(true));
+        expect(metadataValues).toMatchObject([
+          [
+            {
+              value: 'S2_sId',
+              label: 'S2',
+            },
+            {
+              value: 'other_source_2',
+              label: 'Other Source 2',
+            },
+          ],
+          [
+            {
+              value: 'S2_sId',
+              label: 'S2_es',
+            },
+            {
+              value: 'other_source_2',
+              label: 'Other Source 2 Spanish',
+            },
+          ],
+        ]);
+        expect(allFiles).toEqual(relationshipAcceptanceFixtureBase.files);
+      });
+
+      it('should remove or create connections as necessary', async () => {
+        const { acceptedSuggestion, metadataValues, allFiles } =
+          await prepareAndAcceptRelationshipSuggestion(
+            ['S1_sId', 'S3_sId'],
+            'en',
+            'relationship_to_source',
+            'relationship_extractor'
+          );
+        expect(acceptedSuggestion.state).toEqual(matchState(true));
+        expect(metadataValues).toMatchObject([
+          [
+            { value: 'S1_sId', label: 'S1' },
+            { value: 'S3_sId', label: 'S3' },
+          ],
+          [
+            { value: 'S1_sId', label: 'S1_es' },
+            { value: 'S3_sId', label: 'S3_es' },
+          ],
+        ]);
+        expect(allFiles).toEqual(relationshipAcceptanceFixtureBase.files);
+
+        const removedConnection = await db.mongodb
+          ?.collection('connections')
+          .findOne({ entity: 'S2_sId', template: factory.id('related') });
+        expect(removedConnection).toBeNull();
+
+        const newConnection = await db.mongodb
+          ?.collection('connections')
+          .findOne({ entity: 'S3_sId' });
+        expect(newConnection).toMatchObject({
+          entity: 'S3_sId',
+          hub: expect.any(ObjectId),
+          template: factory.id('related'),
+        });
+        const newHub = newConnection?.hub;
+        const pairedConnection = await db.mongodb
+          ?.collection('connections')
+          .findOne({ entity: 'entityWithRelationships_sId', hub: newHub });
+        expect(pairedConnection).toMatchObject({
+          entity: 'entityWithRelationships_sId',
+          hub: newHub,
+        });
+      });
+    });
   });
 
   describe('save()', () => {
diff --git a/app/api/suggestions/suggestions.ts b/app/api/suggestions/suggestions.ts
index 225181bcc0..0e5f1ebd21 100644
--- a/app/api/suggestions/suggestions.ts
+++ b/app/api/suggestions/suggestions.ts
@@ -23,7 +23,7 @@ import {
 import { objectIndex } from 'shared/data_utils/objectIndex';
 import {
   getSegmentedFilesIds,
-  propertyTypeIsSelectOrMultiSelect,
+  propertyTypeIsWithoutExtractedMetadata,
 } from 'api/services/informationextraction/getFiles';
 import { Extractors } from 'api/services/informationextraction/ixextractors';
 import { registerEventListeners } from './eventListeners';
@@ -48,7 +48,7 @@ const updateExtractedMetadata = async (
   suggestions: IXSuggestionType[],
   property: PropertySchema
 ) => {
-  if (propertyTypeIsSelectOrMultiSelect(property.type)) return;
+  if (propertyTypeIsWithoutExtractedMetadata(property.type)) return;
 
   const fetchedFiles = await files.get({ _id: { $in: suggestions.map(s => s.fileId) } });
   const suggestionsByFileId = objectIndex(
@@ -205,15 +205,22 @@ const propertyTypesWithAllLanguages = new Set(['numeric', 'date', 'select', 'mul
 const needsAllLanguages = (propertyType: PropertySchema['type']) =>
   propertyTypesWithAllLanguages.has(propertyType);
 
+const validTypesForPartialAcceptance = new Set(['multiselect', 'relationship']);
+
+const typeIsValidForPartialAcceptance = (propertyType: string) =>
+  validTypesForPartialAcceptance.has(propertyType);
+
 const validatePartialAcceptanceTypeConstraint = (
   acceptedSuggestions: AcceptedSuggestion[],
   property: PropertySchema
 ) => {
   const addedValuesExist = acceptedSuggestions.some(s => s.addedValues);
   const removedValuesExist = acceptedSuggestions.some(s => s.removedValues);
-  const multiSelectOnly = addedValuesExist || removedValuesExist;
-  if (property.type !== 'multiselect' && multiSelectOnly) {
-    throw new SuggestionAcceptanceError('Partial acceptance is only allowed for multiselects.');
+  const partialAcceptanceTriggered = addedValuesExist || removedValuesExist;
+  if (!typeIsValidForPartialAcceptance(property.type) && partialAcceptanceTriggered) {
+    throw new SuggestionAcceptanceError(
+      'Partial acceptance is only allowed for multiselects or relationships.'
+    );
   }
 };
 
diff --git a/app/api/suggestions/updateEntities.ts b/app/api/suggestions/updateEntities.ts
index d66e97090c..2639819f95 100644
--- a/app/api/suggestions/updateEntities.ts
+++ b/app/api/suggestions/updateEntities.ts
@@ -1,9 +1,11 @@
 import entities from 'api/entities';
-import translations from 'api/i18n/translations';
+import { checkTypeIsAllowed } from 'api/services/informationextraction/ixextractors';
 import thesauri from 'api/thesauri';
 import { flatThesaurusValues } from 'api/thesauri/thesauri';
+import { ObjectId } from 'mongodb';
 import { arrayBidirectionalDiff } from 'shared/data_utils/arrayBidirectionalDiff';
 import { IndexTypes, objectIndex } from 'shared/data_utils/objectIndex';
+import { syncedPromiseLoop } from 'shared/data_utils/promiseUtils';
 import { setIntersection } from 'shared/data_utils/setUtils';
 import { ObjectIdSchema, PropertySchema } from 'shared/types/commonTypes';
 import { EntitySchema } from 'shared/types/entityType';
@@ -19,6 +21,10 @@ interface AcceptedSuggestion {
   removedValues?: string[];
 }
 
+type EntityInfo = Record<string, { sharedId: string; template: ObjectId }>;
+
+const fetchNoResources = async () => ({});
+
 const fetchThesaurus = async (thesaurusId: PropertySchema['content']) => {
   const dict = await thesauri.getById(thesaurusId);
   const thesaurusName = dict!.name;
@@ -31,39 +37,61 @@ const fetchThesaurus = async (thesaurusId: PropertySchema['content']) => {
   return { name: thesaurusName, id: thesaurusId, indexedlabels };
 };
 
-const fetchTranslations = async (property: PropertySchema) => {
-  const trs = await translations.get({ context: property.content });
-  const indexed = objectIndex(
-    trs,
-    t => t.locale || '',
-    t => t.contexts?.[0].values
+const fetchEntityInfo = async (
+  _property: PropertySchema,
+  acceptedSuggestions: AcceptedSuggestion[],
+  suggestions: IXSuggestionType[]
+): Promise<{ entityInfo: EntityInfo }> => {
+  const suggestionSharedIds = suggestions.map(s => s.suggestedValue).flat();
+  const addedSharedIds = acceptedSuggestions.map(s => s.addedValues || []).flat();
+  const expectedSharedIds = Array.from(new Set(suggestionSharedIds.concat(addedSharedIds)));
+  const entitiesInDb = (await entities.get({ sharedId: { $in: expectedSharedIds } }, [
+    'sharedId',
+    'template',
+  ])) as { sharedId: string; template: ObjectId }[];
+  const indexedBySharedId = objectIndex(
+    entitiesInDb,
+    e => e.sharedId,
+    e => e
   );
-  return indexed;
+  return { entityInfo: indexedBySharedId };
 };
 
 const fetchSelectResources = async (property: PropertySchema) => {
   const thesaurus = await fetchThesaurus(property.content);
-  const labelTranslations = await fetchTranslations(property);
-  return { thesaurus, translations: labelTranslations };
+  return { thesaurus };
 };
 
 const resourceFetchers = {
-  _default: async () => ({}),
+  title: fetchNoResources,
+  text: fetchNoResources,
+  numeric: fetchNoResources,
+  date: fetchNoResources,
   select: fetchSelectResources,
   multiselect: fetchSelectResources,
+  relationship: fetchEntityInfo,
 };
 
-const fetchResources = async (property: PropertySchema) => {
-  // @ts-ignore
-  const fetcher = resourceFetchers[property.type] || resourceFetchers._default;
-  return fetcher(property);
+const fetchResources = async (
+  property: PropertySchema,
+  acceptedSuggestions: AcceptedSuggestion[],
+  suggestions: IXSuggestionType[]
+) => {
+  const type = checkTypeIsAllowed(property.type);
+  const fetcher = resourceFetchers[type];
+  return fetcher(property, acceptedSuggestions, suggestions);
 };
 
+const getAcceptedSuggestion = (
+  entity: EntitySchema,
+  acceptedSuggestionsBySharedId: Record<IndexTypes, AcceptedSuggestion>
+): AcceptedSuggestion => acceptedSuggestionsBySharedId[entity.sharedId || ''];
+
 const getSuggestion = (
   entity: EntitySchema,
   suggestionsById: Record<IndexTypes, IXSuggestionType>,
   acceptedSuggestionsBySharedId: Record<IndexTypes, AcceptedSuggestion>
-) => suggestionsById[acceptedSuggestionsBySharedId[entity.sharedId || '']._id.toString()];
+) => suggestionsById[getAcceptedSuggestion(entity, acceptedSuggestionsBySharedId)._id.toString()];
 
 const getRawValue = (
   entity: EntitySchema,
@@ -88,17 +116,6 @@ const checkValuesInThesaurus = (
   }
 };
 
-const mapLabels = (
-  values: string[],
-  entity: EntitySchema,
-  thesaurus: { indexedlabels: Record<IndexTypes, string> },
-  translation: Record<IndexTypes, Record<IndexTypes, string>>
-) => {
-  const labels = values.map(v => thesaurus.indexedlabels[v]);
-  const translatedLabels = labels.map(l => translation[entity.language || '']?.[l]);
-  return values.map((value, index) => ({ value, label: translatedLabels[index] }));
-};
-
 function readAddedValues(acceptedSuggestion: AcceptedSuggestion, suggestionValues: string[]) {
   const addedValues = acceptedSuggestion.addedValues || [];
   const addedButNotSuggested = arrayBidirectionalDiff(
@@ -146,7 +163,7 @@ function mixFinalValues(
   return finalValues;
 }
 
-function arrangeValues(
+function arrangeAddedOrRemovedValues(
   acceptedSuggestion: AcceptedSuggestion,
   suggestionValues: string[],
   entity: EntitySchema,
@@ -163,36 +180,66 @@ function arrangeValues(
   return finalValues;
 }
 
+function checkSharedIds(values: string[], entityInfo: EntityInfo) {
+  const missingSharedIds = values.filter(v => !(v in entityInfo));
+  if (missingSharedIds.length > 0) {
+    throw new SuggestionAcceptanceError(
+      `The following sharedIds do not exist in the database: ${missingSharedIds.join(', ')}.`
+    );
+  }
+}
+
+function checkTemplates(property: PropertySchema, values: string[], entityInfo: EntityInfo) {
+  const { content } = property;
+  if (!content) return;
+  const templateId = new ObjectId(content);
+  const wrongTemplatedSharedIds = values.filter(
+    v => entityInfo[v].template.toString() !== templateId.toString()
+  );
+  if (wrongTemplatedSharedIds.length > 0) {
+    throw new SuggestionAcceptanceError(
+      `The following sharedIds do not match the content template in the relationship property: ${wrongTemplatedSharedIds.join(', ')}.`
+    );
+  }
+}
+
+const getRawValueAsArray = (
+  _property: PropertySchema,
+  entity: EntitySchema,
+  suggestionsById: Record<IndexTypes, IXSuggestionType>,
+  acceptedSuggestionsBySharedId: Record<IndexTypes, AcceptedSuggestion>
+) => [
+  {
+    value: getRawValue(entity, suggestionsById, acceptedSuggestionsBySharedId),
+  },
+];
+
 const valueGetters = {
-  _default: (
-    entity: EntitySchema,
-    suggestionsById: Record<IndexTypes, IXSuggestionType>,
-    acceptedSuggestionsBySharedId: Record<IndexTypes, AcceptedSuggestion>
-  ) => [
-    {
-      value: getRawValue(entity, suggestionsById, acceptedSuggestionsBySharedId),
-    },
-  ],
+  text: getRawValueAsArray,
+  date: getRawValueAsArray,
+  numeric: getRawValueAsArray,
   select: (
+    _property: PropertySchema,
     entity: EntitySchema,
     suggestionsById: Record<IndexTypes, IXSuggestionType>,
     acceptedSuggestionsBySharedId: Record<IndexTypes, AcceptedSuggestion>,
     resources: any
   ) => {
-    const { thesaurus, translations: translation } = resources;
+    const { thesaurus } = resources;
     const value = getRawValue(entity, suggestionsById, acceptedSuggestionsBySharedId) as string;
     checkValuesInThesaurus([value], thesaurus.name, thesaurus.indexedlabels);
 
-    return mapLabels([value], entity, thesaurus, translation);
+    return [{ value }];
   },
   multiselect: (
+    _property: PropertySchema,
     entity: EntitySchema,
     suggestionsById: Record<IndexTypes, IXSuggestionType>,
     acceptedSuggestionsBySharedId: Record<IndexTypes, AcceptedSuggestion>,
     resources: any
   ) => {
-    const { thesaurus, translations: translation } = resources;
-    const acceptedSuggestion = acceptedSuggestionsBySharedId[entity.sharedId || ''];
+    const { thesaurus } = resources;
+    const acceptedSuggestion = getAcceptedSuggestion(entity, acceptedSuggestionsBySharedId);
     const suggestion = getSuggestion(entity, suggestionsById, acceptedSuggestionsBySharedId);
     const suggestionValues = getRawValue(
       entity,
@@ -201,14 +248,42 @@ const valueGetters = {
     ) as string[];
     checkValuesInThesaurus(suggestionValues, thesaurus.name, thesaurus.indexedlabels);
 
-    const finalValues: string[] = arrangeValues(
+    const finalValues: string[] = arrangeAddedOrRemovedValues(
       acceptedSuggestion,
       suggestionValues,
       entity,
       suggestion
     );
 
-    return mapLabels(finalValues, entity, thesaurus, translation);
+    return finalValues.map(value => ({ value }));
+  },
+  relationship: (
+    property: PropertySchema,
+    entity: EntitySchema,
+    suggestionsById: Record<IndexTypes, IXSuggestionType>,
+    acceptedSuggestionsBySharedId: Record<IndexTypes, AcceptedSuggestion>,
+    resources: any
+  ) => {
+    const { entityInfo } = resources;
+
+    const acceptedSuggestion = getAcceptedSuggestion(entity, acceptedSuggestionsBySharedId);
+    const suggestion = getSuggestion(entity, suggestionsById, acceptedSuggestionsBySharedId);
+    const suggestionValues = getRawValue(
+      entity,
+      suggestionsById,
+      acceptedSuggestionsBySharedId
+    ) as string[];
+    checkSharedIds(suggestionValues, entityInfo);
+    checkTemplates(property, suggestionValues, entityInfo);
+
+    const finalValues: string[] = arrangeAddedOrRemovedValues(
+      acceptedSuggestion,
+      suggestionValues,
+      entity,
+      suggestion
+    );
+
+    return finalValues.map(value => ({ value }));
   },
 };
 
@@ -219,9 +294,18 @@ const getValue = (
   acceptedSuggestionsBySharedId: Record<IndexTypes, AcceptedSuggestion>,
   resources: any
 ) => {
-  // @ts-ignore
-  const getter = valueGetters[property.type] || valueGetters._default;
-  return getter(entity, suggestionsById, acceptedSuggestionsBySharedId, resources);
+  const type = checkTypeIsAllowed(property.type);
+  if (type === 'title') {
+    throw new SuggestionAcceptanceError('Title should not be handled here.');
+  }
+  const getter = valueGetters[type];
+  return getter(property, entity, suggestionsById, acceptedSuggestionsBySharedId, resources);
+};
+
+const saveEntities = async (entitiesToUpdate: EntitySchema[]) => {
+  await syncedPromiseLoop(entitiesToUpdate, async (entity: EntitySchema) => {
+    await entities.save(entity, { user: {}, language: entity.language });
+  });
 };
 
 const updateEntitiesWithSuggestion = async (
@@ -249,7 +333,7 @@ const updateEntitiesWithSuggestion = async (
     s => s
   );
 
-  const resources = await fetchResources(property);
+  const resources = await fetchResources(property, acceptedSuggestions, suggestions);
 
   const entitiesToUpdate =
     propertyName !== 'title'
@@ -272,7 +356,7 @@ const updateEntitiesWithSuggestion = async (
           title: getRawValue(entity, suggestionsById, acceptedSuggestionsBySharedId),
         }));
 
-  await entities.saveMultiple(entitiesToUpdate);
+  await saveEntities(entitiesToUpdate);
 };
 
 export { updateEntitiesWithSuggestion, SuggestionAcceptanceError };
diff --git a/app/api/suggestions/updateState.ts b/app/api/suggestions/updateState.ts
index 78bb8a1e25..a352033ed0 100644
--- a/app/api/suggestions/updateState.ts
+++ b/app/api/suggestions/updateState.ts
@@ -2,7 +2,7 @@ import settings from 'api/settings';
 import templates from 'api/templates';
 import { objectIndex } from 'shared/data_utils/objectIndex';
 import { CurrentValue, getSuggestionState, SuggestionValues } from 'shared/getIXSuggestionState';
-import { propertyIsMultiselect } from 'shared/propertyTypes';
+import { propertyIsMultiselect, propertyIsRelationship } from 'shared/propertyTypes';
 import { LanguagesListSchema, PropertyTypeSchema } from 'shared/types/commonTypes';
 import { IXSuggestionsModel } from './IXSuggestionsModel';
 import {
@@ -95,7 +95,9 @@ const postProcessCurrentValue = (
   suggestion: SuggestionsAggregationResult,
   propertyType: PropertyTypeSchema
 ): PostProcessedAggregationResult => {
-  if (propertyIsMultiselect(propertyType)) return suggestion;
+  if (propertyIsMultiselect(propertyType) || propertyIsRelationship(propertyType)) {
+    return suggestion;
+  }
   return {
     ...suggestion,
     currentValue: suggestion.currentValue.length > 0 ? suggestion.currentValue[0] : '',
diff --git a/app/api/users/routes.js b/app/api/users/routes.js
index 779df0fd26..a8db8cbfbc 100644
--- a/app/api/users/routes.js
+++ b/app/api/users/routes.js
@@ -1,6 +1,6 @@
 import { parseQuery, validation } from 'api/utils';
 import { userSchema } from 'shared/types/userSchema';
-import needsAuthorization from '../auth/authMiddleware';
+import { needsAuthorization, validatePasswordMiddleWare } from '../auth';
 import users from './users';
 
 const getDomain = req => `${req.protocol}://${req.get('host')}`;
@@ -8,6 +8,7 @@ export default app => {
   app.post(
     '/api/users',
     needsAuthorization(['admin', 'editor', 'collaborator']),
+    validatePasswordMiddleWare,
     validation.validateRequest({
       type: 'object',
       properties: {
@@ -27,6 +28,7 @@ export default app => {
   app.post(
     '/api/users/new',
     needsAuthorization(),
+    validatePasswordMiddleWare,
     validation.validateRequest({
       type: 'object',
       properties: {
@@ -45,6 +47,7 @@ export default app => {
   app.post(
     '/api/users/unlock',
     needsAuthorization(),
+    validatePasswordMiddleWare,
     validation.validateRequest({
       type: 'object',
       properties: {
@@ -149,6 +152,7 @@ export default app => {
     '/api/users',
     needsAuthorization(),
     parseQuery,
+    validatePasswordMiddleWare,
     validation.validateRequest({
       type: 'object',
       properties: {
diff --git a/app/api/users/specs/routes.spec.ts b/app/api/users/specs/routes.spec.ts
index a082be226e..37adaed6dc 100644
--- a/app/api/users/specs/routes.spec.ts
+++ b/app/api/users/specs/routes.spec.ts
@@ -19,6 +19,16 @@ jest.mock(
   }
 );
 
+jest.mock('../../auth', () => {
+  const originalModule = jest.requireActual('../../auth');
+  return {
+    ...originalModule,
+    validatePasswordMiddleWare: jest.fn((_req: Request, _res: Response, next: NextFunction) => {
+      next();
+    }),
+  };
+});
+
 const invalidUserProperties = [
   { field: 'username', value: undefined, instancePath: '/body', keyword: 'required' },
   { field: 'email', value: undefined, instancePath: '/body', keyword: 'required' },
@@ -32,6 +42,7 @@ const invalidUserProperties = [
 const adminUser = {
   _id: 'admin1',
   username: 'Admin 1',
+  password: 'admin124',
   role: UserRole.ADMIN,
   email: 'admin@test.com',
 };
diff --git a/app/api/users/specs/users.spec.js b/app/api/users/specs/users.spec.js
index 15a8e84ee0..63bb517206 100644
--- a/app/api/users/specs/users.spec.js
+++ b/app/api/users/specs/users.spec.js
@@ -7,7 +7,7 @@ import mailer from 'api/utils/mailer';
 import db from 'api/utils/testing_db';
 import * as random from 'shared/uniqueID';
 
-import encryptPassword, { comparePasswords } from 'api/auth/encryptPassword';
+import { encryptPassword, comparePasswords } from 'api/auth/encryptPassword';
 import * as usersUtils from 'api/auth2fa/usersUtils';
 import { settingsModel } from 'api/settings/settingsModel';
 import userGroups from 'api/usergroups/userGroups';
diff --git a/app/api/users/users.js b/app/api/users/users.js
index 2e8dff14a4..1ee897b591 100644
--- a/app/api/users/users.js
+++ b/app/api/users/users.js
@@ -2,7 +2,7 @@ import SHA256 from 'crypto-js/sha256';
 
 import { createError } from 'api/utils';
 import random from 'shared/uniqueID';
-import encryptPassword, { comparePasswords } from 'api/auth/encryptPassword';
+import { encryptPassword, comparePasswords } from 'api/auth/encryptPassword';
 import * as usersUtils from 'api/auth2fa/usersUtils';
 
 import {
@@ -323,3 +323,5 @@ export default {
     throw createError('key not found', 403);
   },
 };
+
+export { validateUserPassword };
diff --git a/app/react/App/styles/globals.css b/app/react/App/styles/globals.css
index 440b13a002..3fad0b9fc4 100644
--- a/app/react/App/styles/globals.css
+++ b/app/react/App/styles/globals.css
@@ -1833,6 +1833,10 @@ input[type="range"]::-ms-fill-lower {
   margin-top: 1.5rem;
 }
 
+.ml-1 {
+  margin-left: 0.25rem;
+}
+
 .block {
   display: block;
 }
@@ -2924,6 +2928,11 @@ input[type="range"]::-ms-fill-lower {
   background-color: rgb(67 56 202 / var(--tw-bg-opacity));
 }
 
+.bg-primary-900 {
+  --tw-bg-opacity: 1;
+  background-color: rgb(49 46 129 / var(--tw-bg-opacity));
+}
+
 .bg-red-100 {
   --tw-bg-opacity: 1;
   background-color: rgb(253 232 232 / var(--tw-bg-opacity));
@@ -3125,6 +3134,16 @@ input[type="range"]::-ms-fill-lower {
   padding-bottom: 3px;
 }
 
+.py-\[2px\] {
+  padding-top: 2px;
+  padding-bottom: 2px;
+}
+
+.py-\[1px\] {
+  padding-top: 1px;
+  padding-bottom: 1px;
+}
+
 .pb-14 {
   padding-bottom: 3.5rem;
 }
@@ -3270,6 +3289,14 @@ input[type="range"]::-ms-fill-lower {
   line-height: 1rem;
 }
 
+.text-\[8px\] {
+  font-size: 8px;
+}
+
+.text-\[10px\] {
+  font-size: 10px;
+}
+
 .font-black {
   font-weight: 900;
 }
@@ -3519,6 +3546,11 @@ input[type="range"]::-ms-fill-lower {
   color: rgb(114 59 19 / var(--tw-text-opacity));
 }
 
+.text-primary-900 {
+  --tw-text-opacity: 1;
+  color: rgb(49 46 129 / var(--tw-text-opacity));
+}
+
 .underline {
   text-decoration-line: underline;
 }
diff --git a/app/react/Markdown/MarkdownViewer.js b/app/react/Markdown/MarkdownViewer.js
index 2d459fc3e1..8561a3591e 100644
--- a/app/react/Markdown/MarkdownViewer.js
+++ b/app/react/Markdown/MarkdownViewer.js
@@ -6,6 +6,7 @@ import { MarkdownLink, SearchBox, MarkdownMedia, ItemList } from './components';
 import CustomHookComponents from './CustomHooks';
 
 import markdownToReact from './markdownToReact';
+import { ValidatedElement } from './ValidatedElement';
 
 class MarkdownViewer extends Component {
   static errorHtml(index, message) {
@@ -116,7 +117,11 @@ class MarkdownViewer extends Component {
       return false;
     }
 
-    return <div className="markdown-viewer">{ReactFromMarkdown}</div>;
+    return ValidatedElement(
+      'div',
+      { className: 'markdown-viewer' },
+      ...React.Children.toArray(ReactFromMarkdown)
+    );
   }
 }
 
diff --git a/app/react/Markdown/ValidatedElement.tsx b/app/react/Markdown/ValidatedElement.tsx
new file mode 100644
index 0000000000..3ba6a277d0
--- /dev/null
+++ b/app/react/Markdown/ValidatedElement.tsx
@@ -0,0 +1,37 @@
+import React from 'react';
+import { validHtmlTags } from './utils';
+
+const isValidTagName = (tagName: string): boolean => validHtmlTags.has(tagName);
+
+const ValidatedElement = (
+  type: string | React.JSXElementConstructor<any>,
+  props: (React.Attributes & { children?: React.ReactNode }) | null,
+  ...children: React.ReactNode[]
+): React.ReactElement | null => {
+  if (typeof type === 'string' && !isValidTagName(type)) {
+    return React.createElement('div', { className: 'error' }, `Invalid tag: ${type}`);
+  }
+
+  const validatedChildren = children.map(child => {
+    if (Array.isArray(child)) {
+      return child.map(c => {
+        const childProps = c.props as React.Attributes & { children?: React.ReactNode };
+        return React.isValidElement(c)
+          ? ValidatedElement(c.type, childProps, ...React.Children.toArray(childProps.children))
+          : c;
+      });
+    }
+    if (React.isValidElement(child)) {
+      return ValidatedElement(
+        child.type,
+        child.props as React.Attributes & { children?: React.ReactNode },
+        ...React.Children.toArray(child.props.children)
+      );
+    }
+    return child;
+  });
+
+  return React.createElement(type, props, ...validatedChildren);
+};
+
+export { ValidatedElement };
diff --git a/app/react/Markdown/specs/MarkdownViewer.spec.js b/app/react/Markdown/specs/MarkdownViewer.spec.js
index ab7a4a4f41..7484f7b619 100644
--- a/app/react/Markdown/specs/MarkdownViewer.spec.js
+++ b/app/react/Markdown/specs/MarkdownViewer.spec.js
@@ -157,13 +157,22 @@ describe('MarkdownViewer', () => {
     });
 
     describe('when not valid html', () => {
-      it('should not fail', () => {
+      it('should not fail on malformed tags', () => {
         props.markdown = '<div><h</div>';
         props.html = true;
 
         render();
         expect(component).toMatchSnapshot();
       });
+
+      it('should not fail on unsupported tags', () => {
+        props.html = true;
+        props.markdown =
+          "<b>Little red ridding hood</b>\n<p>I don't know <..long pause..> a minute later  <..pause..> a grandma story.\nWhen I heard it</p>";
+
+        render();
+        expect(component).toMatchSnapshot();
+      });
     });
 
     it('should render a searchbox', () => {
diff --git a/app/react/Markdown/specs/__snapshots__/MarkdownViewer.spec.js.snap b/app/react/Markdown/specs/__snapshots__/MarkdownViewer.spec.js.snap
index d6c5660cd8..49a174f09e 100644
--- a/app/react/Markdown/specs/__snapshots__/MarkdownViewer.spec.js.snap
+++ b/app/react/Markdown/specs/__snapshots__/MarkdownViewer.spec.js.snap
@@ -4,24 +4,18 @@ exports[`MarkdownViewer render should be able to render properly custom componen
 <div
   className="markdown-viewer"
 >
-  <div
-    key="0"
-  >
+  <div>
     <MarkdownMedia
       compact={false}
       config="(youtubeUrl)"
-      key="0"
     />
   </div>
   
 
-  <div
-    key="2"
-  >
+  <div>
     <MarkdownMedia
       compact={false}
       config="(mediaUrl)"
-      key="2"
     />
   </div>
   
@@ -33,9 +27,7 @@ exports[`MarkdownViewer render should not render html by default 1`] = `
 <div
   className="markdown-viewer"
 >
-  <p
-    key="0"
-  >
+  <p>
     &lt;div&gt;&lt;h1&gt;should be all a escaped string&lt;/h1&gt;&lt;/div&gt;
   </p>
   
@@ -47,9 +39,7 @@ exports[`MarkdownViewer render should remove Dataset and Query tags 1`] = `
 <div
   className="markdown-viewer"
 >
-  <p
-    key="0"
-  >
+  <p>
     test
   </p>
   
@@ -60,16 +50,13 @@ exports[`MarkdownViewer render should remove Dataset and Query tags 1`] = `
 
   <SearchBox
     classname=""
-    key="6"
     placeholder=""
   />
   
 
   
 
-  <div
-    key="10"
-  >
+  <div>
     test
   </div>
 </div>
@@ -79,75 +66,39 @@ exports[`MarkdownViewer render should remove whitespaces between table tags (to
 <div
   className="markdown-viewer"
 >
-  <table
-    key="0"
-  >
-    <thead
-      key="0"
-    >
-      <tr
-        key="0"
-      >
-        <th
-          key="0"
-        >
+  <table>
+    <thead>
+      <tr>
+        <th>
           cadh
         </th>
-        <th
-          key="1"
-        >
+        <th>
           cbdp
         </th>
-        <th
-          key="2"
-        >
+        <th>
           cidfp
         </th>
-        <th
-          key="3"
-        >
+        <th>
           cipst
         </th>
       </tr>
     </thead>
-    <tbody
-      key="1"
-    >
-      <tr
-        key="0"
-      >
-        <td
-          key="0"
-        >
+    <tbody>
+      <tr>
+        <td>
           1.1,25.1
         </td>
-        <td
-          key="1"
-        />
-        <td
-          key="2"
-        />
-        <td
-          key="3"
-        />
+        <td />
+        <td />
+        <td />
       </tr>
-      <tr
-        key="1"
-      >
-        <td
-          key="0"
-        >
+      <tr>
+        <td>
           1.1,21.1,21.2,25,1
         </td>
-        <td
-          key="1"
-        />
-        <td
-          key="2"
-        />
-        <td
-          key="3"
-        />
+        <td />
+        <td />
+        <td />
       </tr>
     </tbody>
   </table>
@@ -162,18 +113,14 @@ exports[`MarkdownViewer render should render Link 1`] = `
 >
   <MarkdownLink
     classname=""
-    key="0"
     label="this is a label"
     url="this_is_the_url"
   />
   
 
-  <p
-    key="2"
-  >
+  <p>
     <MarkdownLink
       classname=""
-      key="0"
       url="the_url"
     >
       label
@@ -190,7 +137,6 @@ exports[`MarkdownViewer render should render a searchbox 1`] = `
 >
   <SearchBox
     classname=""
-    key="0"
     placeholder="this is a placeholder"
   />
   
@@ -219,27 +165,22 @@ exports[`MarkdownViewer render should render customHook components and show an e
       ]
     }
     component="validcomponent"
-    key="0"
     prop="a prop"
   />
   
 
-  <p
-    key="2"
-  >
+  <p>
     Should allow markdown between hooks
   </p>
   
 
   <customComponent
     component="validcomponent"
-    key="4"
   />
   
 
   <p
     className="error"
-    key="6"
   >
     <br />
     <strong>
@@ -270,7 +211,6 @@ exports[`MarkdownViewer render should render list components 1`] = `
         "items1",
       ]
     }
-    key="0"
     link="/library/param1"
     options={
       Object {
@@ -286,7 +226,6 @@ exports[`MarkdownViewer render should render list components 1`] = `
         "items2",
       ]
     }
-    key="2"
     link="/library/param2"
     options={Object {}}
   />
@@ -298,7 +237,6 @@ exports[`MarkdownViewer render should render list components 1`] = `
         "items3",
       ]
     }
-    key="4"
     link="/library/param3"
     options={Object {}}
   />
@@ -311,20 +249,15 @@ exports[`MarkdownViewer render should render markdown 1`] = `
 <div
   className="markdown-viewer"
 >
-  <h2
-    key="0"
-  >
+  <h2>
     title
   </h2>
   
 
-  <p
-    key="2"
-  >
+  <p>
     Some text with a 
     <a
       href="http://google.com"
-      key="1"
     >
       URL
     </a>
@@ -332,19 +265,14 @@ exports[`MarkdownViewer render should render markdown 1`] = `
   </p>
   
 
-  <p
-    key="4"
-  >
+  <p>
     Which should be in its own line, separated with TWO line breaks (to create a new &lt;p&gt; Element)
   </p>
   
 
-  <pre
-    key="6"
-  >
+  <pre>
     <code
       className="language-javascript"
-      key="0"
     >
       Code
 
@@ -359,35 +287,26 @@ exports[`MarkdownViewer render should render media components 1`] = `
 <div
   className="markdown-viewer"
 >
-  <div
-    key="0"
-  >
+  <div>
     <MarkdownMedia
       compact={false}
       config="(1234, options)"
-      key="0"
     />
   </div>
   
 
-  <div
-    key="2"
-  >
+  <div>
     <MarkdownMedia
       compact={false}
       config="(1234)"
-      key="2"
     />
   </div>
   
 
-  <div
-    key="4"
-  >
+  <div>
     <MarkdownMedia
       compact={false}
       config="(config options)"
-      key="4"
     />
   </div>
   
@@ -399,23 +318,18 @@ exports[`MarkdownViewer render should render properly a selfclosing XML tags 1`]
 <div
   className="markdown-viewer"
 >
-  <p
-    key="0"
-  >
+  <p>
     test
   </p>
   
 
   <SearchBox
     classname=""
-    key="2"
     placeholder=""
   />
   
 
-  <div
-    key="4"
-  >
+  <div>
     test
   </div>
 </div>
@@ -425,21 +339,15 @@ exports[`MarkdownViewer render should render single tags as self closing 1`] = `
 <div
   className="markdown-viewer"
 >
-  <p
-    key="0"
-  >
+  <p>
     test
   </p>
   
 
-  <hr
-    key="2"
-  />
+  <hr />
   
 
-  <p
-    key="4"
-  >
+  <p>
     test
   </p>
   
@@ -453,11 +361,8 @@ exports[`MarkdownViewer render should support containers with custom classNames
 >
   <div
     className="test classname"
-    key="0"
   >
-    <p
-      key="0"
-    >
+    <p>
       text inside a div
     </p>
     
@@ -468,13 +373,33 @@ exports[`MarkdownViewer render should support containers with custom classNames
 
 exports[`MarkdownViewer render when markdown is invalid should not render anything when its empty 1`] = `""`;
 
-exports[`MarkdownViewer render when not valid html should not fail 1`] = `
+exports[`MarkdownViewer render when not valid html should not fail on malformed tags 1`] = `
 <div
   className="markdown-viewer"
 >
-  <div
-    key="0"
-  />
+  <div />
+</div>
+`;
+
+exports[`MarkdownViewer render when not valid html should not fail on unsupported tags 1`] = `
+<div
+  className="markdown-viewer"
+>
+  <p>
+    <b>
+      Little red ridding hood
+    </b>
+  </p>
+  
+
+  <p>
+    I don't know 
+    <div
+      className="error"
+    >
+      Invalid tag: ..long
+    </div>
+  </p>
 </div>
 `;
 
@@ -482,16 +407,13 @@ exports[`MarkdownViewer render when passing html true prop should render customC
 <div
   className="markdown-viewer"
 >
-  <div
-    key="0"
-  >
+  <div>
     <ItemList
       items={
         Array [
           "items1",
         ]
       }
-      key="0"
       link="/library/param1"
       options={
         Object {
@@ -499,16 +421,11 @@ exports[`MarkdownViewer render when passing html true prop should render customC
         }
       }
     />
-    <div
-      key="1"
-    >
-      <div
-        key="0"
-      >
+    <div>
+      <div>
         <MarkdownMedia
           compact={false}
           config="(url)"
-          key="0"
         />
       </div>
     </div>
@@ -520,12 +437,8 @@ exports[`MarkdownViewer render when passing html true prop should render html 1`
 <div
   className="markdown-viewer"
 >
-  <div
-    key="0"
-  >
-    <h1
-      key="0"
-    >
+  <div>
+    <h1>
       test
     </h1>
   </div>
diff --git a/app/react/Markdown/utils.js b/app/react/Markdown/utils.js
index ee77685fe9..2c57a9f647 100644
--- a/app/react/Markdown/utils.js
+++ b/app/react/Markdown/utils.js
@@ -1,4 +1,4 @@
-export const objectPath = (path, object) =>
+const objectPath = (path, object) =>
   path.split('.').reduce((o, key) => {
     if (!o || !key) {
       return o;
@@ -6,10 +6,181 @@ export const objectPath = (path, object) =>
     return o.toJS ? o.get(key) : o[key];
   }, object);
 
-export const logError = (err, propValueOf, propLabelOf) => {
+const logError = (err, propValueOf, propLabelOf) => {
   /* eslint-disable no-console */
   console.error('Error on EntityData: ');
   console.error('value-of: ', propValueOf, '; label-of: ', propLabelOf);
   console.error(err);
   /* eslint-enable no-console */
 };
+
+const validHtmlTags = new Set([
+  'a',
+  'abbr',
+  'acronym',
+  'address',
+  'area',
+  'article',
+  'aside',
+  'audio',
+  'b',
+  'bdi',
+  'bdo',
+  'big',
+  'blink',
+  'blockquote',
+  'body',
+  'br',
+  'button',
+  'canvas',
+  'caption',
+  'center',
+  'circle',
+  'cite',
+  'clipPath',
+  'code',
+  'col',
+  'colgroup',
+  'content',
+  'data',
+  'datalist',
+  'dd',
+  'decorator',
+  'defs',
+  'del',
+  'desc',
+  'details',
+  'dfn',
+  'dir',
+  'div',
+  'dl',
+  'dt',
+  'element',
+  'ellipse',
+  'em',
+  'feBlend',
+  'feColorMatrix',
+  'feComponentTransfer',
+  'feComposite',
+  'feConvolveMatrix',
+  'feDiffuseLighting',
+  'feDisplacementMap',
+  'feDistantLight',
+  'feFlood',
+  'feFuncA',
+  'feFuncB',
+  'feFuncG',
+  'feFuncR',
+  'feGaussianBlur',
+  'feImage',
+  'feMerge',
+  'feMergeNode',
+  'feMorphology',
+  'feOffset',
+  'fePointLight',
+  'feSpecularLighting',
+  'feSpotLight',
+  'feTile',
+  'feTurbulence',
+  'fieldset',
+  'figcaption',
+  'figure',
+  'filter',
+  'font',
+  'footer',
+  'foreignObject',
+  'form',
+  'g',
+  'h1',
+  'h2',
+  'h3',
+  'h4',
+  'h5',
+  'h6',
+  'head',
+  'header',
+  'hgroup',
+  'hr',
+  'html',
+  'i',
+  'iframe',
+  'image',
+  'img',
+  'input',
+  'ins',
+  'kbd',
+  'label',
+  'legend',
+  'li',
+  'line',
+  'linearGradient',
+  'main',
+  'map',
+  'mark',
+  'marker',
+  'marquee',
+  'mask',
+  'menu',
+  'menuitem',
+  'metadata',
+  'meter',
+  'nav',
+  'nobr',
+  'ol',
+  'optgroup',
+  'option',
+  'output',
+  'p',
+  'path',
+  'pattern',
+  'polygon',
+  'polyline',
+  'pre',
+  'progress',
+  'q',
+  'radialGradient',
+  'rect',
+  'rp',
+  'rt',
+  'ruby',
+  's',
+  'samp',
+  'section',
+  'select',
+  'shadow',
+  'small',
+  'source',
+  'spacer',
+  'span',
+  'strike',
+  'strong',
+  'style',
+  'sub',
+  'summary',
+  'sup',
+  'svg',
+  'switch',
+  'symbol',
+  'table',
+  'tbody',
+  'td',
+  'template',
+  'textarea',
+  'tfoot',
+  'th',
+  'thead',
+  'time',
+  'tr',
+  'track',
+  'tspan',
+  'tt',
+  'u',
+  'ul',
+  'use',
+  'var',
+  'video',
+  'view',
+  'wbr',
+]);
+
+export { objectPath, logError, validHtmlTags };
diff --git a/app/react/Routes.tsx b/app/react/Routes.tsx
index 2b175ba633..7a586d3b51 100644
--- a/app/react/Routes.tsx
+++ b/app/react/Routes.tsx
@@ -113,16 +113,18 @@ const getRoutesLayout = (
         <Route path="new" element={adminsOnlyRoute(<NewTemplate />)} />
         <Route path="edit/:templateId" element={adminsOnlyRoute(<EditTemplate />)} />
       </Route>
-      <Route
-        path="metadata_extraction"
-        element={adminsOnlyRoute(<IXDashboard />)}
-        loader={IXdashboardLoader(headers)}
-      />
-      <Route
-        path="metadata_extraction/suggestions/:extractorId"
-        loader={IXSuggestionsLoader(headers)}
-        element={adminsOnlyRoute(<IXSuggestions />)}
-      />
+      <Route path="metadata_extraction">
+        <Route
+          index
+          element={adminsOnlyRoute(<IXDashboard />)}
+          loader={IXdashboardLoader(headers)}
+        />
+        <Route
+          path="suggestions/:extractorId"
+          loader={IXSuggestionsLoader(headers)}
+          element={adminsOnlyRoute(<IXSuggestions />)}
+        />
+      </Route>
       <Route path="relationship-types">
         <Route
           index
@@ -202,7 +204,7 @@ const getRoutes = (
   return createRoutesFromElements(
     <Route path="/" element={<App customParams={parameters} />}>
       {layout}
-      <Route path=":lang">
+      <Route path="/:lang">
         {layout}
         <Route path="*" element={<GeneralError />} />
       </Route>
diff --git a/app/react/V2/Components/Forms/MultiselectList.tsx b/app/react/V2/Components/Forms/MultiselectList.tsx
index f1d172f781..a981a2aff0 100644
--- a/app/react/V2/Components/Forms/MultiselectList.tsx
+++ b/app/react/V2/Components/Forms/MultiselectList.tsx
@@ -47,6 +47,7 @@ const MultiselectList = ({
   singleSelect = false,
   allowSelelectAll = false,
 }: MultiselectListProps) => {
+  console.log(value);
   const [selectedItems, setSelectedItems] = useState<string[]>(value || []);
   const [showAll, setShowAll] = useState<boolean>(true);
   const [searchTerm, setSearchTerm] = useState('');
diff --git a/app/react/V2/Components/Layouts/SettingsContent.tsx b/app/react/V2/Components/Layouts/SettingsContent.tsx
index 960ba744f1..8407bc1ff1 100644
--- a/app/react/V2/Components/Layouts/SettingsContent.tsx
+++ b/app/react/V2/Components/Layouts/SettingsContent.tsx
@@ -1,9 +1,8 @@
 /* eslint-disable react/no-multi-comp */
-import { Link } from 'react-router-dom';
 import React, { PropsWithChildren } from 'react';
 import { Breadcrumb } from 'flowbite-react';
 import { ChevronLeftIcon } from '@heroicons/react/20/solid';
-import { Translate } from 'app/I18N';
+import { I18NLink, Translate } from 'app/I18N';
 
 interface SettingsContentProps extends PropsWithChildren {
   className?: string;
@@ -31,12 +30,12 @@ const SettingsContent = ({ children, className }: SettingsContentProps) => (
 
 const SettingsHeader = ({ contextId, title, children, path, className }: SettingsHeaderProps) => (
   <div className={`${className || ''} flex pt-5 pb-4 px-4 `} data-testid="settings-content-header">
-    <Link to="/settings" className="block lg:hidden">
+    <I18NLink to="/settings" className="block lg:hidden">
       <ChevronLeftIcon className="w-8 stroke-1 lg:hidden" />
       <span className="sr-only">
         <Translate>Navigate back</Translate>
       </span>
-    </Link>
+    </I18NLink>
     <Breadcrumb className="!relative p-1 flex right-0 !bg-transparent m-0 !w-full flex-wrap align-middle">
       {Array.from(path?.entries() || []).map(([key, value]) => (
         <Breadcrumb.Item key={key} href={value} className="max-w-xs">
diff --git a/app/react/V2/Components/Layouts/specs/SettingsContent.cy.tsx b/app/react/V2/Components/Layouts/specs/SettingsContent.cy.tsx
index e8b5a9c7d2..4bb80c381c 100644
--- a/app/react/V2/Components/Layouts/specs/SettingsContent.cy.tsx
+++ b/app/react/V2/Components/Layouts/specs/SettingsContent.cy.tsx
@@ -47,7 +47,7 @@ describe('ConfirmationModal', () => {
     cy.get('[data-testid="settings-content-header"]')
       .invoke('text')
       .should('contain', 'Root PathMiddle PathLeafCurrent page');
-    cy.get('a[href="/settings"]').should('not.be.visible');
+    cy.get('a[href="/en/settings"]').should('not.be.visible');
     cy.contains('a', 'Root Path').invoke('attr', 'href').should('include', '#top');
     cy.contains('a', 'Middle Path').invoke('attr', 'href').should('include', '#bottom');
     cy.contains('a', 'Leaf').invoke('attr', 'href').should('include', '#footer');
@@ -58,6 +58,6 @@ describe('ConfirmationModal', () => {
   it('should have an arrow to return to settings menu for mobile', () => {
     cy.viewport(450, 650);
     render();
-    cy.get('a[href="/settings"]').should('be.visible');
+    cy.get('a[href="/en/settings"]').should('be.visible');
   });
 });
diff --git a/app/react/V2/Components/UI/ConfirmationModal.tsx b/app/react/V2/Components/UI/ConfirmationModal.tsx
index 2386537bf3..778335f3a3 100644
--- a/app/react/V2/Components/UI/ConfirmationModal.tsx
+++ b/app/react/V2/Components/UI/ConfirmationModal.tsx
@@ -8,12 +8,13 @@ type confirmationModalType = {
   size?: modalSizeType;
   header?: string | React.ReactNode;
   body?: string | React.ReactNode;
-  onAcceptClick?: () => void;
+  onAcceptClick?: (value: string) => void;
   onCancelClick?: () => void;
   acceptButton?: string | React.ReactNode;
   cancelButton?: string | React.ReactNode;
   warningText?: string | React.ReactNode;
   confirmWord?: string;
+  usePassword?: boolean;
   dangerStyle?: boolean;
 };
 
@@ -26,10 +27,12 @@ const ConfirmationModal = ({
   cancelButton,
   warningText,
   confirmWord,
+  usePassword,
   size = 'md',
   dangerStyle = false,
 }: confirmationModalType) => {
-  const [confirmed, setConfirmed] = useState(confirmWord === undefined);
+  const [inputValue, setInputValue] = useState('');
+  const [confirmed, setConfirmed] = useState(!(confirmWord || usePassword));
 
   const renderChild = (child: string | React.ReactNode) =>
     isString(child) ? <Translate>{child}</Translate> : child;
@@ -71,6 +74,26 @@ const ConfirmationModal = ({
             />
           </div>
         )}
+
+        {usePassword && (
+          <div className="py-4">
+            <span className="block mb-2 font-medium text-gray-900 text-md dark:text-white">
+              <label htmlFor="confirm-password">
+                <Translate>Enter your current password to confirm</Translate>&nbsp;
+              </label>
+            </span>
+            <input
+              id="confirm-password"
+              className="bg-gray-50 border border-gray-300 text-gray-900 text-sm rounded-lg focus:ring-blue-500 focus:border-blue-500 block w-full p-2.5 dark:bg-gray-700 dark:border-gray-600 dark:placeholder-gray-400 dark:text-white dark:focus:ring-blue-500 dark:focus:border-blue-500"
+              type="password"
+              autoComplete="off"
+              onChange={e => {
+                setInputValue(e.currentTarget.value);
+                setConfirmed(e.currentTarget.value.length > 0);
+              }}
+            />
+          </div>
+        )}
       </Modal.Body>
       <Modal.Footer>
         <Button
@@ -82,7 +105,7 @@ const ConfirmationModal = ({
           {renderChild(cancelButton || 'Cancel')}
         </Button>
         <Button
-          onClick={onAcceptClick}
+          onClick={onAcceptClick ? () => onAcceptClick(inputValue || '') : undefined}
           disabled={!confirmed}
           color={!warningText && !dangerStyle ? 'primary' : 'error'}
           className="grow"
diff --git a/app/react/V2/Components/UI/specs/ConfirmationModal.cy.tsx b/app/react/V2/Components/UI/specs/ConfirmationModal.cy.tsx
index 266ba66cac..f1e20f5c00 100644
--- a/app/react/V2/Components/UI/specs/ConfirmationModal.cy.tsx
+++ b/app/react/V2/Components/UI/specs/ConfirmationModal.cy.tsx
@@ -4,9 +4,10 @@ import { mount } from '@cypress/react18';
 import { composeStories } from '@storybook/react';
 import * as stories from 'app/stories/ConfirmationModal.stories';
 
-const { BasicConfirmation, TextConfirmation, WarningConfirmation } = composeStories(stories);
+const { BasicConfirmation, TextConfirmation, WarningConfirmation, PasswordConfirm } =
+  composeStories(stories);
 
-describe('ConfirmationModal', () => {
+describe('Confirmation modals', () => {
   it('should be accessible', () => {
     cy.injectAxe();
 
@@ -18,6 +19,9 @@ describe('ConfirmationModal', () => {
 
     mount(<WarningConfirmation />);
     cy.checkA11y();
+
+    mount(<PasswordConfirm />);
+    cy.checkA11y();
   });
 
   it('should show a simple confirmation', () => {
@@ -27,18 +31,6 @@ describe('ConfirmationModal', () => {
     cy.contains('Please type').should('not.exist');
   });
 
-  it('should check confirmation text to accept action', () => {
-    mount(<TextConfirmation />);
-    cy.contains('Delete Confirmation').should('be.visible');
-    cy.contains('Are you sure you want to delete this product?').should('be.visible');
-    cy.contains('Please type in CONFIRMATION_TEXT:').should('be.visible');
-    cy.contains('Yes').should('be.disabled');
-    cy.get('[data-testid="confirm-input"]').type('CONFIRMATION_');
-    cy.contains('Yes').should('be.disabled');
-    cy.get('[data-testid="confirm-input"]').type('TEXT');
-    cy.contains('Yes').should('not.be.disabled');
-  });
-
   it('should execute actions', () => {
     const onAcceptClick = cy.stub().as('accept');
     const onCancelClick = cy.stub().as('cancel');
@@ -49,9 +41,46 @@ describe('ConfirmationModal', () => {
     cy.get('@cancel').should('have.been.called');
   });
 
-  it('should show a warning', () => {
-    mount(<WarningConfirmation />);
-    cy.contains('Are you sure').should('be.visible');
-    cy.contains('Other users will be affected by this action').should('be.visible');
+  describe('Text confirmation', () => {
+    it('should check confirmation text to accept action', () => {
+      mount(<TextConfirmation />);
+      cy.contains('Delete Confirmation').should('be.visible');
+      cy.contains('Are you sure you want to delete this product?').should('be.visible');
+      cy.contains('Please type in CONFIRMATION_TEXT:').should('be.visible');
+      cy.contains('Yes').should('be.disabled');
+      cy.get('[data-testid="confirm-input"]').type('CONFIRMATION_');
+      cy.contains('Yes').should('be.disabled');
+      cy.get('[data-testid="confirm-input"]').type('TEXT');
+      cy.contains('Yes').should('not.be.disabled');
+    });
+
+    it('should show a warning', () => {
+      mount(<WarningConfirmation />);
+      cy.contains('Are you sure').should('be.visible');
+      cy.contains('Other users will be affected by this action').should('be.visible');
+    });
+  });
+
+  describe('Password confirmation', () => {
+    it('should enable save button when input has value', () => {
+      mount(<PasswordConfirm />);
+      cy.contains('Enter your current password to confirm');
+      cy.contains('button', 'Accept').should('be.disabled');
+      cy.get('input').type('value');
+      cy.contains('button', 'Accept').should('be.enabled');
+      cy.get('input').clear();
+      cy.contains('button', 'Accept').should('be.disabled');
+    });
+
+    it('should execute actions', () => {
+      const onAcceptClick = cy.stub().as('accept');
+      const onCancelClick = cy.stub().as('cancel');
+      mount(<PasswordConfirm onAcceptClick={onAcceptClick} onCancelClick={onCancelClick} />);
+      cy.get('input').type('currentPassword');
+      cy.contains('Accept').click();
+      cy.get('@accept').should('have.been.calledOnceWith', 'currentPassword');
+      cy.contains('Cancel').click();
+      cy.get('@cancel').should('have.been.called');
+    });
   });
 });
diff --git a/app/react/V2/Routes/Settings/Account/Account.tsx b/app/react/V2/Routes/Settings/Account/Account.tsx
index 32ff69be27..f036e0d266 100644
--- a/app/react/V2/Routes/Settings/Account/Account.tsx
+++ b/app/react/V2/Routes/Settings/Account/Account.tsx
@@ -1,58 +1,73 @@
+/* eslint-disable max-statements */
 /* eslint-disable react/jsx-props-no-spreading */
-import React, { useEffect, useState } from 'react';
+import React, { useRef, useState } from 'react';
 import { IncomingHttpHeaders } from 'http';
-import { RequestParams } from 'app/utils/RequestParams';
-import UsersAPI from 'app/Users/UsersAPI';
-import { UserSchema } from 'shared/types/userType';
-
 import { LoaderFunction, useLoaderData, useRevalidator } from 'react-router-dom';
 import { useForm } from 'react-hook-form';
 import { useSetAtom } from 'jotai';
-import { notificationAtom } from 'app/V2/atoms';
-
-import { InputField } from 'app/V2/Components/Forms';
-import { Button, Card } from 'app/V2/Components/UI';
-import { SettingsContent } from 'app/V2/Components/Layouts/SettingsContent';
+import { ClientUserSchema } from 'app/apiResponseTypes';
+import { FetchResponseError } from 'shared/JSONRequest';
+import { validEmailFormat } from 'V2/shared/formatHelpers';
 import { Translate } from 'app/I18N';
+import { updateUser, getCurrentUser } from 'V2/api/users';
+import { notificationAtom } from 'V2/atoms';
+import { InputField } from 'V2/Components/Forms';
+import { Button, Card, ConfirmationModal } from 'V2/Components/UI';
+import { SettingsContent } from 'V2/Components/Layouts/SettingsContent';
 import { TwoFactorSetup } from './Components/TwoFactorSetup';
 
 const accountLoader =
   (headers?: IncomingHttpHeaders): LoaderFunction =>
   async () =>
-    UsersAPI.currentUser(new RequestParams({}, headers));
+    getCurrentUser(headers);
 
 const Account = () => {
-  const userAccount = useLoaderData() as UserSchema;
+  const userAccount = useLoaderData() as ClientUserSchema;
   const [isSidepanelOpen, setIsSidepanelOpen] = useState(false);
+  const [confirmationModal, setConfirmationModal] = useState(false);
+  const passwordConfirmation = useRef<string>();
+  const formSubmit = useRef<HTMLButtonElement>(null);
   const setNotifications = useSetAtom(notificationAtom);
   const revalidator = useRevalidator();
 
-  type AccountForm = UserSchema & { passwordConfirm?: string };
+  type AccountForm = ClientUserSchema & { passwordConfirm?: string };
+
   const {
     register,
     watch,
     handleSubmit,
-    reset,
-    formState: { errors, isSubmitted },
+    trigger,
+    resetField,
+    formState: { errors, isDirty },
   } = useForm<AccountForm>({
     defaultValues: userAccount,
     mode: 'onSubmit',
   });
 
-  const submit = async (data: AccountForm) => {
+  const onSubmit = async (data: AccountForm, currentPassword: string) => {
     const { passwordConfirm, ...userData } = data;
     userData.password = userData.password ? userData.password : userAccount.password;
-    await UsersAPI.save(new RequestParams(userData));
-    await revalidator.revalidate();
-    setNotifications({
-      type: 'success',
-      text: <Translate>Account updated</Translate>,
-    });
-  };
 
-  useEffect(() => {
-    reset({ ...userAccount, password: '', passwordConfirm: '' });
-  }, [userAccount, reset]);
+    const response = await updateUser(userData, currentPassword);
+
+    if (response instanceof FetchResponseError) {
+      const message = response.json?.prettyMessage ? response.json.prettyMessage : response.message;
+      setNotifications({
+        type: 'error',
+        text: <Translate>An error occurred</Translate>,
+        details: message || undefined,
+      });
+    } else {
+      setNotifications({
+        type: 'success',
+        text: <Translate>Account updated</Translate>,
+      });
+      revalidator.revalidate();
+    }
+
+    resetField('password');
+    resetField('passwordConfirm');
+  };
 
   return (
     <div
@@ -63,7 +78,12 @@ const Account = () => {
       <SettingsContent>
         <SettingsContent.Header title="Account" />
         <SettingsContent.Body>
-          <form onSubmit={handleSubmit(submit)} id="account-form">
+          <form
+            id="account-form"
+            onSubmit={handleSubmit(async data =>
+              onSubmit(data, passwordConfirmation.current || '')
+            )}
+          >
             <Card className="mb-4" title={<Translate>General Information</Translate>}>
               <div className="grid gap-4 sm:grid-cols-2 sm:gap-6">
                 <div className="sm:col-span-1">
@@ -87,8 +107,18 @@ const Account = () => {
                     id="account-email"
                     hasErrors={!!errors.email}
                     label={<Translate>Email</Translate>}
-                    {...register('email', { required: true })}
+                    {...register('email', {
+                      required: true,
+                      validate: {
+                        format: email => validEmailFormat(email),
+                      },
+                    })}
                   />
+                  {errors.email && (
+                    <p className="mt-2 text-sm text-error-600">
+                      <Translate>A valid email is required</Translate>
+                    </p>
+                  )}
                 </div>
               </div>
             </Card>
@@ -102,7 +132,7 @@ const Account = () => {
                     {...register('password')}
                     type="password"
                   />
-                  {errors.passwordConfirm && isSubmitted && (
+                  {errors.passwordConfirm && (
                     <p className="mt-2 text-sm text-error-600">
                       <Translate>Passwords do not match</Translate>
                     </p>
@@ -158,6 +188,8 @@ const Account = () => {
                 </div>
               </Card>
             )}
+
+            <button type="submit" hidden aria-hidden="true" disabled ref={formSubmit} />
           </form>
         </SettingsContent.Body>
         <SettingsContent.Footer>
@@ -170,7 +202,16 @@ const Account = () => {
               <Translate>Logout</Translate>
             </a>
 
-            <Button type="submit" form="account-form">
+            <Button
+              type="button"
+              onClick={async () => {
+                const validation = await trigger();
+                if (validation) {
+                  setConfirmationModal(true);
+                }
+              }}
+              disabled={!isDirty}
+            >
               <Translate>Update</Translate>
             </Button>
           </div>
@@ -180,6 +221,24 @@ const Account = () => {
       {userAccount.using2fa ? null : (
         <TwoFactorSetup isOpen={isSidepanelOpen} closePanel={() => setIsSidepanelOpen(false)} />
       )}
+
+      {confirmationModal && (
+        <ConfirmationModal
+          header="Confirm"
+          body="Confirm action"
+          usePassword
+          onCancelClick={() => setConfirmationModal(false)}
+          onAcceptClick={value => {
+            if (formSubmit.current) {
+              passwordConfirmation.current = value;
+              formSubmit.current.disabled = false;
+              formSubmit.current.click();
+              formSubmit.current.disabled = true;
+              setConfirmationModal(false);
+            }
+          }}
+        />
+      )}
     </div>
   );
 };
diff --git a/app/react/V2/Routes/Settings/IX/IXSuggestions.tsx b/app/react/V2/Routes/Settings/IX/IXSuggestions.tsx
index 30f7c37abd..1cc8284355 100644
--- a/app/react/V2/Routes/Settings/IX/IXSuggestions.tsx
+++ b/app/react/V2/Routes/Settings/IX/IXSuggestions.tsx
@@ -60,16 +60,24 @@ const ixmessages = {
 };
 
 const IXSuggestions = () => {
-  const { suggestions, extractor, templates, aggregation, currentStatus, totalPages } =
-    useLoaderData() as {
-      totalPages: number;
-      suggestions: TableSuggestion[];
-      extractor: IXExtractorInfo;
-      templates: ClientTemplateSchema[];
-      aggregation: any;
-      currentStatus: ixStatus;
-      _id: string;
-    };
+  const {
+    suggestions,
+    extractor,
+    templates,
+    aggregation,
+    currentStatus,
+    totalPages,
+    activeFilters,
+  } = useLoaderData() as {
+    totalPages: number;
+    suggestions: TableSuggestion[];
+    extractor: IXExtractorInfo;
+    templates: ClientTemplateSchema[];
+    aggregation: any;
+    currentStatus: ixStatus;
+    _id: string;
+    activeFilters: number;
+  };
 
   const [currentSuggestions, setCurrentSuggestions] = useState<TableSuggestion[]>(suggestions);
   const [property, setProperty] = useState<ClientPropertySchema>();
@@ -84,7 +92,7 @@ const IXSuggestions = () => {
   }, [templates, extractor]);
 
   useMemo(() => {
-    if (property?.type === 'multiselect') {
+    if (property?.type === 'multiselect' || property?.type === 'relationship') {
       const flatenedSuggestions = suggestions.map(suggestion =>
         generateChildrenRows(suggestion as MultiValueSuggestion)
       );
@@ -248,6 +256,7 @@ const IXSuggestions = () => {
                 onFiltersButtonClicked={() => {
                   setSidepanel('filters');
                 }}
+                activeFilters={activeFilters}
               />
             }
             enableSelection
@@ -259,7 +268,7 @@ const IXSuggestions = () => {
                 <PaginationState
                   page={Number(searchParams.get('page') || 1)}
                   size={SUGGESTIONS_PER_PAGE}
-                  total={status.data?.total || totalPages * SUGGESTIONS_PER_PAGE}
+                  total={aggregation.total || totalPages * SUGGESTIONS_PER_PAGE}
                   currentLength={currentSuggestions.length}
                 />
                 <div>
@@ -366,10 +375,14 @@ const IXSuggestionsLoader =
     if (!extractorId) throw new Error('extractorId is required');
     const searchParams = new URLSearchParams(request.url.split('?')[1]);
     const filter: any = { extractorId };
+    let activeFilters = 0;
     if (searchParams.has('filter')) {
       filter.customFilter = JSON.parse(searchParams.get('filter')!);
+      activeFilters = [
+        ...Object.values(filter.customFilter.labeled),
+        ...Object.values(filter.customFilter.nonLabeled),
+      ].filter(Boolean).length;
     }
-
     const sortingOption = searchParams.has('sort') ? searchParams.get('sort') : undefined;
 
     const suggestionsList: { suggestions: EntitySuggestionType[]; totalPages: number } =
@@ -396,6 +409,7 @@ const IXSuggestionsLoader =
       templates,
       aggregation,
       currentStatus: currentStatus.status,
+      activeFilters,
     };
   };
 
diff --git a/app/react/V2/Routes/Settings/IX/components/ExtractorModal.tsx b/app/react/V2/Routes/Settings/IX/components/ExtractorModal.tsx
index e2c0bb24d9..2549f6cd2f 100644
--- a/app/react/V2/Routes/Settings/IX/components/ExtractorModal.tsx
+++ b/app/react/V2/Routes/Settings/IX/components/ExtractorModal.tsx
@@ -11,7 +11,10 @@ import { InputField } from 'app/V2/Components/Forms/InputField';
 import { RadioSelect } from 'app/V2/Components/Forms';
 import { propertyIcons } from './Icons';
 
-const SUPPORTED_PROPERTIES = ['text', 'numeric', 'date', 'select', 'multiselect'];
+const SUPPORTED_PROPERTIES = ['text', 'numeric', 'date', 'select', 'multiselect', 'relationship'];
+type SupportedProperty = Omit<ClientPropertySchema, 'type'> & {
+  type: 'text' | 'numeric' | 'date' | 'select' | 'multiselect' | 'relationship';
+};
 
 interface ExtractorModalProps {
   setShowModal: React.Dispatch<React.SetStateAction<boolean>>;
@@ -21,30 +24,11 @@ interface ExtractorModalProps {
   extractor?: IXExtractorInfo;
 }
 
-const getPropertyLabel = (property: ClientPropertySchema, templateId: string) => {
-  let icon: React.ReactNode;
-  let propertyTypeTranslationKey = 'property text';
+const getPropertyLabel = (property: SupportedProperty, templateId: string) => {
+  const { type } = property;
 
-  switch (property.type) {
-    case 'numeric':
-      icon = propertyIcons.numeric;
-      propertyTypeTranslationKey = 'property numeric';
-      break;
-    case 'date':
-      icon = propertyIcons.date;
-      propertyTypeTranslationKey = 'property date';
-      break;
-    case 'select':
-      icon = propertyIcons.select;
-      propertyTypeTranslationKey = 'property select';
-      break;
-    case 'multiselect':
-      icon = propertyIcons.multiselect;
-      propertyTypeTranslationKey = 'property multiselect';
-      break;
-    default:
-      icon = propertyIcons.text;
-  }
+  const icon = propertyIcons[type];
+  const propertyTypeTranslationKey = `property ${type}`;
 
   return (
     <div className="flex items-center gap-2">
@@ -77,7 +61,7 @@ const formatOptions = (values: string[], templates: ClientTemplateSchema[]) => {
               SUPPORTED_PROPERTIES.includes(prop.type)
           )
           .map(prop => ({
-            label: getPropertyLabel(prop, template._id),
+            label: getPropertyLabel(prop as SupportedProperty, template._id),
             value: `${template._id?.toString()}-${prop.name}`,
             searchLabel: prop.label,
           })),
@@ -114,7 +98,7 @@ const getPropertyForValue = (value: string, templates: ClientTemplateSchema[]) =
 
   const matchedProperty = matchedTemplate?.properties.find(
     property => property.name === propertyName
-  );
+  ) as SupportedProperty;
 
   if (matchedProperty) {
     return getPropertyLabel(matchedProperty, matchedTemplate!._id.toString());
diff --git a/app/react/V2/Routes/Settings/IX/components/Icons.tsx b/app/react/V2/Routes/Settings/IX/components/Icons.tsx
index c02e8dc7d3..daab3aa486 100644
--- a/app/react/V2/Routes/Settings/IX/components/Icons.tsx
+++ b/app/react/V2/Routes/Settings/IX/components/Icons.tsx
@@ -5,6 +5,7 @@ import {
   NumericPropertyIcon,
   SelectPropertyIcon,
   TextPropertyIcon,
+  RelationshipPropertyIcon,
 } from 'V2/Components/CustomIcons';
 
 const propertyIcons = {
@@ -14,6 +15,7 @@ const propertyIcons = {
   markdown: <MarkdownPropertyIcon />,
   select: <SelectPropertyIcon />,
   multiselect: <SelectPropertyIcon />,
+  relationship: <RelationshipPropertyIcon />,
 };
 
 export { propertyIcons };
diff --git a/app/react/V2/Routes/Settings/IX/components/PDFSidepanel.tsx b/app/react/V2/Routes/Settings/IX/components/PDFSidepanel.tsx
index cf647bd994..40637ddc42 100644
--- a/app/react/V2/Routes/Settings/IX/components/PDFSidepanel.tsx
+++ b/app/react/V2/Routes/Settings/IX/components/PDFSidepanel.tsx
@@ -62,7 +62,7 @@ const getFormValue = (
       value = dateString;
     }
 
-    if (type === 'select' || type === 'multiselect') {
+    if (type === 'select' || type === 'multiselect' || type === 'relationship') {
       value = entityMetadata?.map((metadata: MetadataObjectSchema) => metadata.value);
     }
   }
@@ -225,10 +225,8 @@ const PDFSidepanel = ({
   }, [pdf, setValue, showSidepanel, suggestion]);
 
   useEffect(() => {
-    console.log('pdfContainerRef', pdfContainerRef);
     if (pdfContainerRef.current) {
       const { height } = pdfContainerRef.current.getBoundingClientRect();
-      console.log('height', height);
       setPdfContainerHeight(height);
     }
   }, [labelInputIsOpen, pdfContainerRef.current]);
@@ -313,7 +311,7 @@ const PDFSidepanel = ({
     }
     const inputType = type === 'numeric' ? 'number' : type;
     return (
-      <div className="relative flex gap-2 px-4 pb-4 grow">
+      <div className={`relative flex gap-2 px-4 pb-4 grow ${labelInputIsOpen ? '' : 'hidden'}`}>
         <div className="grow">
           <InputField
             clearFieldAction={() => {
@@ -369,7 +367,7 @@ const PDFSidepanel = ({
     items?: Option[];
   }
 
-  const renderSelect = (type: 'select' | 'multiselect') => {
+  const renderSelect = (type: 'select' | 'multiselect' | 'relationship') => {
     const options: Option[] = [];
     thesaurus?.values.forEach((value: any) => {
       options.push({
@@ -380,7 +378,7 @@ const PDFSidepanel = ({
     });
 
     return (
-      <div className="px-4 pb-4 overflow-y-scroll grow">
+      <div className={`px-4 pb-4 overflow-y-scroll grow ${labelInputIsOpen ? '' : 'hidden'}`}>
         <MultiselectList
           onChange={values => {
             setValue('field', values, { shouldDirty: true });
@@ -402,6 +400,7 @@ const PDFSidepanel = ({
         return renderInputText(property?.type);
       case 'select':
       case 'multiselect':
+      case 'relationship':
         return renderSelect(property?.type);
       default:
         return '';
@@ -448,7 +447,7 @@ const PDFSidepanel = ({
           </form>{' '}
         </div>
         <Sidepanel.Footer
-          className={`absolute max-h-[40%] ${labelInputIsOpen && ['select', 'multiselect'].includes(property?.type || '') ? 'h-[40%]' : ''}`}
+          className={`absolute max-h-[40%] ${labelInputIsOpen && ['select', 'multiselect', 'relationship'].includes(property?.type || '') ? 'h-[40%]' : ''}`}
         >
           <div className="relative flex flex-col h-full py-0 border border-b-0 border-l-0 border-r-0 border-gray-200 border-t-1">
             <div className="sticky top-0 flex px-4 py-2 bg-white">
@@ -462,7 +461,7 @@ const PDFSidepanel = ({
                 {labelInputIsOpen ? <ChevronDownIcon width={20} /> : <ChevronUpIcon width={20} />}
               </span>
             </div>
-            {labelInputIsOpen && renderLabel()}
+            {renderLabel()}
             <div className="sticky bottom-0 flex justify-end gap-2 px-4 py-2 bg-white border border-b-0 border-l-0 border-r-0 border-gray-200 border-t-1">
               <Button
                 type="button"
diff --git a/app/react/V2/Routes/Settings/IX/components/SuggestedValue.tsx b/app/react/V2/Routes/Settings/IX/components/SuggestedValue.tsx
index 8c51842657..b9c66d377e 100644
--- a/app/react/V2/Routes/Settings/IX/components/SuggestedValue.tsx
+++ b/app/react/V2/Routes/Settings/IX/components/SuggestedValue.tsx
@@ -52,7 +52,7 @@ const SuggestedValue = ({
       return secondsToDate(value, locale);
     }
 
-    if (type === 'select' || type === 'multiselect') {
+    if (type === 'select' || type === 'multiselect' || type === 'relationship') {
       const label = thesaurus?.values.find(v => v.id === value)?.label;
       return <Translate context={content}>{label}</Translate>;
     }
@@ -67,7 +67,7 @@ const SuggestedValue = ({
     if (type === 'date') {
       return secondsToDate((suggestion.suggestedValue as string | number) || '', locale);
     }
-    if (type === 'select' || type === 'multiselect') {
+    if (type === 'select' || type === 'multiselect' || type === 'relationship') {
       const label = thesaurus?.values.find(v => v.id === suggestion.suggestedValue)?.label;
       return <Translate context={content}>{label}</Translate>;
     }
diff --git a/app/react/V2/Routes/Settings/IX/components/SuggestionsTitle.tsx b/app/react/V2/Routes/Settings/IX/components/SuggestionsTitle.tsx
index 1fd731eb8d..884a231a3f 100644
--- a/app/react/V2/Routes/Settings/IX/components/SuggestionsTitle.tsx
+++ b/app/react/V2/Routes/Settings/IX/components/SuggestionsTitle.tsx
@@ -9,16 +9,19 @@ import {
   NumericPropertyIcon,
   TextPropertyIcon,
   SelectPropertyIcon,
+  RelationshipPropertyIcon,
 } from 'app/V2/Components/CustomIcons';
 
 const SuggestionsTitle = ({
   property,
   templates,
   onFiltersButtonClicked,
+  activeFilters,
 }: {
   property: string;
   templates: ClientTemplateSchema[];
   onFiltersButtonClicked: () => void;
+  activeFilters: number;
 }) => {
   const allProperties = [...(templates[0].commonProperties || []), ...templates[0].properties];
   const template = allProperties.find(prop => prop.name === property);
@@ -39,6 +42,9 @@ const SuggestionsTitle = ({
     case 'multiselect':
       propGraphics = <SelectPropertyIcon className="w-3" />;
       break;
+    case 'relationship':
+      propGraphics = <RelationshipPropertyIcon className="w-3" />;
+      break;
     default:
       propGraphics = <TextPropertyIcon className="w-3" />;
   }
@@ -64,8 +70,15 @@ const SuggestionsTitle = ({
 
       <div className="flex-none">
         <Button size="small" styling="light" onClick={onFiltersButtonClicked}>
-          <FunnelIcon className="inline w-5 px-1 text-gray-800" />
+          <FunnelIcon
+            className={`inline w-4 mr-2 ${activeFilters > 0 ? 'text-primary-900' : 'text-gray-800'} `}
+          />
           <Translate>Stats & Filters</Translate>
+          {activeFilters > 0 && (
+            <span className="px-3 py-[2px] ml-2 text-xs text-white rounded-md bg-primary-900">
+              {activeFilters}
+            </span>
+          )}
         </Button>
       </div>
     </div>
diff --git a/app/react/V2/Routes/Settings/IX/components/helpers.ts b/app/react/V2/Routes/Settings/IX/components/helpers.ts
index 43bf59487b..7b4e10ad95 100644
--- a/app/react/V2/Routes/Settings/IX/components/helpers.ts
+++ b/app/react/V2/Routes/Settings/IX/components/helpers.ts
@@ -105,7 +105,7 @@ const updateSuggestionsByEntity = (
 
   if (updatedEntity.metadata[propertyToUpdate]?.length) {
     const newValue = (
-      property?.type === 'multiselect'
+      property?.type === 'multiselect' || property?.type === 'relationship'
         ? updatedEntity.metadata[propertyToUpdate]?.map(v => v.value)
         : updatedEntity.metadata[propertyToUpdate]![0].value
     ) as SuggestionValue;
@@ -119,7 +119,7 @@ const updateSuggestionsByEntity = (
     suggestionToUpdate.state.match = suggestionToUpdate.suggestedValue === '';
   }
 
-  if (property?.type === 'multiselect') {
+  if (property?.type === 'multiselect' || property?.type === 'relationship') {
     suggestionToUpdate = generateChildrenRows(suggestionToUpdate as MultiValueSuggestion);
   }
 
diff --git a/app/react/V2/Routes/Settings/Thesauri/ThesauriList.tsx b/app/react/V2/Routes/Settings/Thesauri/ThesauriList.tsx
index 23e7275df6..42fa0492b3 100644
--- a/app/react/V2/Routes/Settings/Thesauri/ThesauriList.tsx
+++ b/app/react/V2/Routes/Settings/Thesauri/ThesauriList.tsx
@@ -56,14 +56,14 @@ const ThesauriList = () => {
   }, [thesauri, templates]);
 
   const navigateToEditThesaurus = (thesaurus: Row<ThesaurusSchema>) => {
-    navigate(`/settings/thesauri/edit/${thesaurus.original._id}`);
+    navigate(`./edit/${thesaurus.original._id}`);
   };
 
   const deleteSelectedThesauri = async () => {
     try {
-      const requests = selectedThesauri.map(sThesauri => {
-        return ThesauriAPI.delete({ _id: sThesauri.original._id });
-      });
+      const requests = selectedThesauri.map(sThesauri =>
+        ThesauriAPI.delete({ _id: sThesauri.original._id })
+      );
       await Promise.all(requests);
       setNotifications({
         type: 'success',
diff --git a/app/react/V2/Routes/Settings/Thesauri/ThesaurusForm.tsx b/app/react/V2/Routes/Settings/Thesauri/ThesaurusForm.tsx
index 21dea30079..df3653dd30 100644
--- a/app/react/V2/Routes/Settings/Thesauri/ThesaurusForm.tsx
+++ b/app/react/V2/Routes/Settings/Thesauri/ThesaurusForm.tsx
@@ -206,7 +206,7 @@ const ThesaurusForm = () => {
           <Translate>Thesauri added.</Translate>
         ),
       });
-      navigate(`/settings/thesauri/edit/${savedThesaurus._id}`);
+      navigate(`../edit/${savedThesaurus._id}`);
     } catch (e) {
       setNotifications({
         type: 'error',
@@ -286,7 +286,7 @@ const ThesaurusForm = () => {
                       type: 'success',
                       text: <Translate>Thesauri updated.</Translate>,
                     });
-                    navigate(`/settings/thesauri/edit/${savedThesaurus._id}`);
+                    navigate(`../edit/${savedThesaurus._id}`);
                   }}
                   onFailure={() => {
                     setNotifications({
diff --git a/app/react/V2/Routes/Settings/Users/Users.tsx b/app/react/V2/Routes/Settings/Users/Users.tsx
index 7a9b7aea30..6362210af9 100644
--- a/app/react/V2/Routes/Settings/Users/Users.tsx
+++ b/app/react/V2/Routes/Settings/Users/Users.tsx
@@ -1,5 +1,5 @@
 /* eslint-disable max-lines */
-import React, { useState } from 'react';
+import React, { useRef, useState } from 'react';
 import { IncomingHttpHeaders } from 'http';
 import { ActionFunction, LoaderFunction, useFetcher, useLoaderData } from 'react-router-dom';
 import { Row } from '@tanstack/react-table';
@@ -37,10 +37,10 @@ const Users = () => {
     header: 'Delete',
     body: 'Do you want to delete?',
   });
-  const [bulkActionIntent, setBulkActionIntent] = useState<FormIntent>('delete-users');
 
+  const password = useRef<string>();
+  const bulkActionIntent = useRef<FormIntent>();
   const fetcher = useFetcher();
-
   useHandleNotifications();
 
   const usersTableColumns = getUsersColumns((user: ClientUserSchema) => {
@@ -55,7 +55,7 @@ const Users = () => {
 
   const handleBulkAction = () => {
     const formData = new FormData();
-    formData.set('intent', bulkActionIntent);
+    formData.set('intent', bulkActionIntent.current || '');
 
     if (activeTab === 'Users') {
       formData.set('data', JSON.stringify(selectedUsers.map(user => user.original)));
@@ -63,6 +63,8 @@ const Users = () => {
       formData.set('data', JSON.stringify(selectedGroups.map(group => group.original)));
     }
 
+    formData.set('confirmation', password.current || '');
+
     fetcher.submit(formData, { method: 'post' });
   };
 
@@ -115,7 +117,7 @@ const Users = () => {
                       header: 'Reset passwords',
                       body: 'Do you want reset the password for the following users?',
                     });
-                    setBulkActionIntent('bulk-reset-password');
+                    bulkActionIntent.current = 'bulk-reset-password';
                     setShowConfirmationModal(true);
                   }}
                 >
@@ -129,7 +131,7 @@ const Users = () => {
                       header: 'Reset 2FA',
                       body: 'Do you want disable 2FA for the following users?',
                     });
-                    setBulkActionIntent('bulk-reset-2fa');
+                    bulkActionIntent.current = 'bulk-reset-2fa';
                     setShowConfirmationModal(true);
                   }}
                 >
@@ -146,7 +148,8 @@ const Users = () => {
                     header: 'Delete',
                     body: 'Do you want to delete the following items?',
                   });
-                  setBulkActionIntent(activeTab === 'Users' ? 'delete-users' : 'delete-groups');
+                  bulkActionIntent.current =
+                    activeTab === 'Users' ? 'delete-users' : 'delete-groups';
                   setShowConfirmationModal(true);
                 }}
               >
@@ -197,7 +200,13 @@ const Users = () => {
           header={confirmationModalProps.header}
           warningText={confirmationModalProps.body}
           body={<ListOfItems items={selectedUsers.length ? selectedUsers : selectedGroups} />}
-          onAcceptClick={() => {
+          usePassword={
+            (selectedUsers.length > 0 &&
+              ['bulk-reset-2fa', 'delete-users'].includes(bulkActionIntent.current || '')) ||
+            false
+          }
+          onAcceptClick={value => {
+            password.current = value;
             handleBulkAction();
             setShowConfirmationModal(false);
             setSelectedGroups([]);
@@ -226,27 +235,28 @@ const userAction =
     const formIntent = formData.get('intent') as FormIntent;
 
     const formValues = JSON.parse(formData.get('data') as string);
+    const confirmation = formData.get('confirmation') as string;
 
     switch (formIntent) {
       case 'new-user':
-        return usersAPI.newUser(formValues);
+        return usersAPI.newUser(formValues, confirmation);
       case 'edit-user':
-        return usersAPI.updateUser(formValues);
+        return usersAPI.updateUser(formValues, confirmation);
       case 'delete-users':
-        return usersAPI.deleteUser(formValues);
+        return usersAPI.deleteUser(formValues, confirmation);
       case 'new-group':
       case 'edit-group':
         return usersAPI.saveGroup(formValues);
       case 'delete-groups':
         return usersAPI.deleteGroup(formValues);
       case 'unlock-user':
-        return usersAPI.unlockAccount(formValues);
+        return usersAPI.unlockAccount(formValues, confirmation);
       case 'reset-password':
       case 'bulk-reset-password':
         return usersAPI.resetPassword(formValues);
       case 'reset-2fa':
       case 'bulk-reset-2fa':
-        return usersAPI.reset2FA(formValues);
+        return usersAPI.reset2FA(formValues, confirmation);
       default:
         return null;
     }
diff --git a/app/react/V2/Routes/Settings/Users/components/GroupFormSidepanel.tsx b/app/react/V2/Routes/Settings/Users/components/GroupFormSidepanel.tsx
index 38fe42c757..c3c3ab9ddb 100644
--- a/app/react/V2/Routes/Settings/Users/components/GroupFormSidepanel.tsx
+++ b/app/react/V2/Routes/Settings/Users/components/GroupFormSidepanel.tsx
@@ -55,21 +55,19 @@ const GroupFormSidepanel = ({
 }: GroupFormSidepanelProps) => {
   const fetcher = useFetcher();
 
-  const defaultValues = { name: '', members: [] } as UserGroupSchema;
+  const defaultValues = selectedGroup || ({ name: '', members: [] } as UserGroupSchema);
 
   const {
     register,
     handleSubmit,
     formState: { errors },
     setValue,
-    reset,
   } = useForm({
     defaultValues,
-    values: selectedGroup,
+    values: defaultValues,
   });
 
   const closeSidepanel = () => {
-    reset(defaultValues);
     setSelected(undefined);
     setShowSidepanel(false);
   };
@@ -89,8 +87,7 @@ const GroupFormSidepanel = ({
 
     formData.set('data', JSON.stringify(formattedData));
     fetcher.submit(formData, { method: 'post' });
-    setShowSidepanel(false);
-    reset(defaultValues);
+    closeSidepanel();
   };
 
   return (
@@ -121,7 +118,7 @@ const GroupFormSidepanel = ({
               </div>
             </Card>
 
-            <div className="mb-5 border rounded-md shadow-sm border-gray-50">
+            <div className="mb-5 rounded-md border border-gray-50 shadow-sm">
               <MultiSelect
                 label={
                   <Translate className="block w-full text-base font-semibold bg-gray-50 text-primary-700">
diff --git a/app/react/V2/Routes/Settings/Users/components/UserFormSidepanel.tsx b/app/react/V2/Routes/Settings/Users/components/UserFormSidepanel.tsx
index d387793312..be5197445d 100644
--- a/app/react/V2/Routes/Settings/Users/components/UserFormSidepanel.tsx
+++ b/app/react/V2/Routes/Settings/Users/components/UserFormSidepanel.tsx
@@ -1,16 +1,21 @@
+/* eslint-disable max-statements */
 /* eslint-disable max-lines */
 /* eslint-disable react/jsx-props-no-spreading */
-import React, { useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { useForm } from 'react-hook-form';
 import { useFetcher } from 'react-router-dom';
+import { FetchResponseError } from 'shared/JSONRequest';
 import { t, Translate } from 'app/I18N';
 import { ClientUserGroupSchema, ClientUserSchema } from 'app/apiResponseTypes';
 import { InputField, Select, MultiSelect } from 'V2/Components/Forms';
-import { Button, Card, Sidepanel } from 'V2/Components/UI';
+import { Button, Card, ConfirmationModal, Sidepanel } from 'V2/Components/UI';
+import { validEmailFormat } from 'V2/shared/formatHelpers';
 import { UserRole } from 'shared/types/userSchema';
 import { QuestionMarkCircleIcon } from '@heroicons/react/20/solid';
 import { PermissionsListModal } from './PermissionsListModal';
 
+type SubmitType = 'formSubmit' | 'reset-2fa' | 'unlock-user' | 'reset-password' | undefined;
+
 interface UserFormSidepanelProps {
   showSidepanel: boolean;
   setShowSidepanel: React.Dispatch<React.SetStateAction<boolean>>;
@@ -65,9 +70,10 @@ const getFieldError = (field: 'username' | 'password' | 'email', type?: string)
 
   if (field === 'email') {
     switch (type) {
+      case 'format':
       case 'required':
-        return 'Email is required';
-      case 'validate':
+        return 'A valid email is required';
+      case 'isUnique':
         return 'Duplicated email';
       default:
         break;
@@ -91,32 +97,49 @@ const UserFormSidepanel = ({
 }: UserFormSidepanelProps) => {
   const fetcher = useFetcher();
   const [showModal, setShowModal] = useState(false);
+  const [showConfirmationModal, setShowConfirmationModal] = useState(false);
+  const password = useRef<string>();
+  const actionType = useRef<SubmitType>();
+  const formSubmitRef = useRef<HTMLButtonElement>(null);
 
-  const defaultValues = {
-    username: '',
-    email: '',
-    password: '',
-    role: 'collaborator',
-    groups: [],
-  } as ClientUserSchema;
+  const defaultValues =
+    selectedUser ||
+    ({
+      username: '',
+      email: '',
+      password: '',
+      role: 'collaborator',
+      groups: [],
+    } as ClientUserSchema);
 
   const {
     register,
     handleSubmit,
-    reset,
+    trigger,
     formState: { errors },
     setValue,
   } = useForm({
     defaultValues,
-    values: selectedUser,
+    values: defaultValues,
   });
 
   const closeSidepanel = () => {
-    reset(defaultValues);
     setSelected(undefined);
     setShowSidepanel(false);
   };
 
+  useEffect(() => {
+    const { data: response, state } = fetcher;
+
+    if (
+      state === 'loading' &&
+      response &&
+      !(response instanceof FetchResponseError || response.status === 403)
+    ) {
+      closeSidepanel();
+    }
+  }, [fetcher]);
+
   const formSubmit = async (data: ClientUserSchema) => {
     const formData = new FormData();
     if (data._id) {
@@ -126,19 +149,16 @@ const UserFormSidepanel = ({
     }
 
     formData.set('data', JSON.stringify(data));
+    formData.set('confirmation', password.current || '');
     fetcher.submit(formData, { method: 'post' });
-    setShowSidepanel(false);
-    reset(defaultValues);
   };
 
-  const onClickSubmit = (intent: string) => {
+  const onClickSubmit = () => {
     const formData = new FormData();
-    formData.set('intent', intent);
+    formData.set('intent', actionType.current || '');
     formData.set('data', JSON.stringify(selectedUser));
+    formData.set('confirmation', password.current || '');
     fetcher.submit(formData, { method: 'post' });
-
-    setShowSidepanel(false);
-    reset(defaultValues);
   };
 
   return (
@@ -198,7 +218,10 @@ const UserFormSidepanel = ({
                     errorMessage={getFieldError('email', errors.email?.type)}
                     {...register('email', {
                       required: true,
-                      validate: email => isUnique(email, selectedUser, users),
+                      validate: {
+                        isUnique: email => isUnique(email, selectedUser, users),
+                        format: email => validEmailFormat(email),
+                      },
                       maxLength: 256,
                     })}
                   />
@@ -226,7 +249,10 @@ const UserFormSidepanel = ({
                       <Button
                         type="button"
                         styling="light"
-                        onClick={() => onClickSubmit('reset-password')}
+                        onClick={() => {
+                          actionType.current = 'reset-password';
+                          onClickSubmit();
+                        }}
                       >
                         <Translate>Reset Password</Translate>
                       </Button>
@@ -234,7 +260,10 @@ const UserFormSidepanel = ({
                       <Button
                         type="button"
                         styling="light"
-                        onClick={() => onClickSubmit('reset-2fa')}
+                        onClick={() => {
+                          actionType.current = 'reset-2fa';
+                          setShowConfirmationModal(true);
+                        }}
                       >
                         <Translate>Reset 2FA</Translate>
                       </Button>
@@ -246,7 +275,10 @@ const UserFormSidepanel = ({
                       type="button"
                       styling="light"
                       color="error"
-                      onClick={() => onClickSubmit('unlock-user')}
+                      onClick={() => {
+                        actionType.current = 'unlock-user';
+                        setShowConfirmationModal(true);
+                      }}
                     >
                       <Translate>Unlock account</Translate>
                     </Button>
@@ -254,7 +286,7 @@ const UserFormSidepanel = ({
                 </div>
               </Card>
 
-              <div className="border rounded-md shadow-sm border-gray-50">
+              <div className="rounded-md border border-gray-50 shadow-sm">
                 <MultiSelect
                   label={
                     <Translate className="block w-full text-base font-semibold bg-gray-50 text-primary-700">
@@ -282,14 +314,46 @@ const UserFormSidepanel = ({
               >
                 <Translate>Cancel</Translate>
               </Button>
-              <Button className="flex-grow" type="submit">
+              <Button
+                className="flex-grow"
+                type="button"
+                onClick={async () => {
+                  const valid = await trigger();
+                  if (valid) {
+                    actionType.current = 'formSubmit';
+                    setShowConfirmationModal(true);
+                  }
+                }}
+              >
                 <Translate>Save</Translate>
               </Button>
             </div>
           </Sidepanel.Footer>
+          <button type="submit" hidden aria-hidden="true" disabled ref={formSubmitRef} />
         </form>
       </Sidepanel>
       <PermissionsListModal showModal={showModal} closeModal={() => setShowModal(false)} />
+      {showConfirmationModal && (
+        <ConfirmationModal
+          header="Confirm"
+          body="Confirm action"
+          usePassword
+          onCancelClick={() => setShowConfirmationModal(false)}
+          onAcceptClick={value => {
+            password.current = value;
+
+            if (actionType.current === 'formSubmit' && formSubmitRef.current) {
+              formSubmitRef.current.disabled = false;
+              formSubmitRef.current.click();
+              formSubmitRef.current.disabled = true;
+            } else {
+              onClickSubmit();
+            }
+
+            setShowConfirmationModal(false);
+          }}
+        />
+      )}
     </>
   );
 };
diff --git a/app/react/V2/Routes/Settings/Users/useHandleNotifications.tsx b/app/react/V2/Routes/Settings/Users/useHandleNotifications.tsx
index f33a680876..327aaa467b 100644
--- a/app/react/V2/Routes/Settings/Users/useHandleNotifications.tsx
+++ b/app/react/V2/Routes/Settings/Users/useHandleNotifications.tsx
@@ -19,10 +19,12 @@ const useHandleNotifications = () => {
     if (!intent || !data) return;
 
     if (data instanceof FetchResponseError) {
+      const message = data.json?.prettyMessage ? data.json.prettyMessage : data.message;
+
       setNotifications({
         type: 'error',
         text: <Translate>An error occurred</Translate>,
-        details: data.json?.prettyMessage ? data.json.prettyMessage : undefined,
+        details: message || undefined,
       });
 
       return;
diff --git a/app/react/V2/api/users/index.ts b/app/react/V2/api/users/index.ts
index 484f1c0b2b..d0368b3144 100644
--- a/app/react/V2/api/users/index.ts
+++ b/app/react/V2/api/users/index.ts
@@ -16,10 +16,17 @@ const prepareUser = (user: ClientUserSchema) => {
   return preparedUser;
 };
 
-const newUser = async (user: ClientUserSchema, headers?: IncomingHttpHeaders) => {
+const newUser = async (
+  user: ClientUserSchema,
+  currentPassword: string,
+  headers?: IncomingHttpHeaders
+) => {
   try {
     const createdUser = prepareUser(user);
-    const requestParams = new RequestParams(createdUser, headers);
+    const requestParams = new RequestParams(createdUser, {
+      ...headers,
+      authorization: `Basic ${currentPassword}`,
+    });
     const response = await UsersAPI.new(requestParams);
     return response;
   } catch (e) {
@@ -27,10 +34,19 @@ const newUser = async (user: ClientUserSchema, headers?: IncomingHttpHeaders) =>
   }
 };
 
-const updateUser = async (user: ClientUserSchema, headers?: IncomingHttpHeaders) => {
+const updateUser = async (
+  user: ClientUserSchema,
+  currentPassword: string,
+  headers?: IncomingHttpHeaders
+) => {
   try {
     const updatedUser = prepareUser(user);
-    const requestParams = new RequestParams(updatedUser, headers);
+
+    const requestParams = new RequestParams(updatedUser, {
+      ...headers,
+      authorization: `Basic ${currentPassword}`,
+    });
+
     const response = await UsersAPI.save(requestParams);
     return response;
   } catch (e) {
@@ -38,9 +54,19 @@ const updateUser = async (user: ClientUserSchema, headers?: IncomingHttpHeaders)
   }
 };
 
-const deleteUser = async (users: ClientUserSchema[], headers?: IncomingHttpHeaders) => {
+const deleteUser = async (
+  users: ClientUserSchema[],
+  currentPassword: string,
+  headers?: IncomingHttpHeaders
+) => {
   try {
-    const requestParams = new RequestParams({ ids: users.map(user => user._id) }, headers);
+    const requestParams = new RequestParams(
+      { ids: users.map(user => user._id) },
+      {
+        ...headers,
+        authorization: `Basic ${currentPassword}`,
+      }
+    );
     const response = await UsersAPI.delete(requestParams);
     return response;
   } catch (e) {
@@ -71,9 +97,19 @@ const deleteGroup = async (groups: ClientUserGroupSchema[], headers?: IncomingHt
   }
 };
 
-const unlockAccount = async (user: ClientUserSchema, headers?: IncomingHttpHeaders) => {
+const unlockAccount = async (
+  user: ClientUserSchema,
+  currentPassword: string,
+  headers?: IncomingHttpHeaders
+) => {
   try {
-    const requestParams = new RequestParams({ _id: user._id }, headers);
+    const requestParams = new RequestParams(
+      { _id: user._id },
+      {
+        ...headers,
+        authorization: `Basic ${currentPassword}`,
+      }
+    );
     const response = await UsersAPI.unlockAccount(requestParams);
     return response;
   } catch (e) {
@@ -106,20 +142,26 @@ const resetPassword = async (
 
 const reset2FA = async (
   data: ClientUserSchema | ClientUserSchema[],
+  currentPassword: string,
   headers?: IncomingHttpHeaders
 ) => {
   try {
+    const headersWithAuth = {
+      ...headers,
+      authorization: `Basic ${currentPassword}`,
+    };
+
     if (Array.isArray(data)) {
       const response = await Promise.all(
         data.map(user => {
-          const requestParams = new RequestParams({ _id: user._id }, headers);
+          const requestParams = new RequestParams({ _id: user._id }, { ...headersWithAuth });
           return api.post('auth2fa-reset', requestParams);
         })
       );
       return response;
     }
 
-    const requestParams = new RequestParams({ _id: data._id }, headers);
+    const requestParams = new RequestParams({ _id: data._id }, { ...headersWithAuth });
     const response = await api.post('auth2fa-reset', requestParams);
     return response;
   } catch (e) {
@@ -137,6 +179,16 @@ const get = async (headers?: IncomingHttpHeaders) => {
   }
 };
 
+const getCurrentUser = async (headers?: IncomingHttpHeaders) => {
+  try {
+    const requestParams = new RequestParams({}, headers);
+    const response = await UsersAPI.currentUser(requestParams);
+    return response;
+  } catch (e) {
+    return e;
+  }
+};
+
 const getUserGroups = async (headers?: IncomingHttpHeaders) => {
   try {
     const requestParams = new RequestParams({}, headers);
@@ -158,4 +210,5 @@ export {
   unlockAccount,
   resetPassword,
   reset2FA,
+  getCurrentUser,
 };
diff --git a/app/react/V2/shared/formatHelpers.ts b/app/react/V2/shared/formatHelpers.ts
index 95e9467b75..f0bd9603c8 100644
--- a/app/react/V2/shared/formatHelpers.ts
+++ b/app/react/V2/shared/formatHelpers.ts
@@ -15,4 +15,6 @@ const getFileNameAndExtension = (filename?: string) => {
   return { name, extension };
 };
 
-export { formatBytes, getFileNameAndExtension };
+const validEmailFormat = (email: string) => /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(email);
+
+export { formatBytes, getFileNameAndExtension, validEmailFormat };
diff --git a/app/react/V2/shared/specs/formatHelpers.spec.ts b/app/react/V2/shared/specs/formatHelpers.spec.ts
index cbd2fe93e4..47a3b8cd7b 100644
--- a/app/react/V2/shared/specs/formatHelpers.spec.ts
+++ b/app/react/V2/shared/specs/formatHelpers.spec.ts
@@ -1,4 +1,4 @@
-import { formatBytes, getFileNameAndExtension } from '../formatHelpers';
+import { formatBytes, getFileNameAndExtension, validEmailFormat } from '../formatHelpers';
 
 describe('Formatting helpers', () => {
   describe('bytes formatter', () => {
@@ -35,4 +35,22 @@ describe('Formatting helpers', () => {
       }
     );
   });
+
+  describe('validate email format', () => {
+    it.each`
+      email                          | result
+      ${'valid@valid.com'}           | ${true}
+      ${'Valid123@domain.co.uk'}     | ${true}
+      ${'user.name+tag@domain.com'}  | ${true}
+      ${'username@sub.domain.com'}   | ${true}
+      ${'username@domain.c'}         | ${true}
+      ${'username@domain.wrong'}     | ${true}
+      ${'username@domain.something'} | ${true}
+      ${'username@domain'}           | ${false}
+      ${'username@.com'}             | ${false}
+      ${'@domain.com'}               | ${false}
+    `('returns $result for $email', ({ email, result }) => {
+      expect(validEmailFormat(email)).toEqual(result);
+    });
+  });
 });
diff --git a/app/react/stories/ConfirmationModal.stories.tsx b/app/react/stories/ConfirmationModal.stories.tsx
index f16e8f068a..a3e65cf9a6 100644
--- a/app/react/stories/ConfirmationModal.stories.tsx
+++ b/app/react/stories/ConfirmationModal.stories.tsx
@@ -7,7 +7,7 @@ import { LEGACY_createStore as createStore } from 'V2/shared/testingHelpers';
 import { Translate } from 'app/I18N';
 
 const meta: Meta<typeof ConfirmationModal> = {
-  title: 'Components/Modal',
+  title: 'Components/Modal/ConfirmationModal',
   component: ConfirmationModal,
   argTypes: {
     onAcceptClick: { action: 'onAcceptClick' },
@@ -28,13 +28,14 @@ const Primary: Story = {
       <div className="tw-content">
         <div className="container w-10 h-10">
           <ConfirmationModal
+            size="md"
             header={args.header}
             body={args.body}
             acceptButton={args.acceptButton}
             cancelButton={args.cancelButton}
             warningText={args.warningText}
             confirmWord={args.confirmWord}
-            size="md"
+            usePassword={args.usePassword}
             onAcceptClick={args.onAcceptClick}
             onCancelClick={args.onCancelClick}
           />
@@ -66,6 +67,7 @@ const TextConfirmation: Story = {
     onCancelClick: action('canceled'),
   },
 };
+
 const WarningConfirmation: Story = {
   ...Primary,
   args: {
@@ -80,6 +82,16 @@ const WarningConfirmation: Story = {
   },
 };
 
-export { BasicConfirmation, TextConfirmation, WarningConfirmation };
+const PasswordConfirm: Story = {
+  ...Primary,
+  args: {
+    header: 'Confirm action',
+    usePassword: true,
+    onAcceptClick: action('accepted'),
+    onCancelClick: action('canceled'),
+  },
+};
+
+export { BasicConfirmation, TextConfirmation, WarningConfirmation, PasswordConfirm };
 
 export default meta;
diff --git a/app/shared/getIXSuggestionState.ts b/app/shared/getIXSuggestionState.ts
index b743e8ec91..44b807eaaa 100644
--- a/app/shared/getIXSuggestionState.ts
+++ b/app/shared/getIXSuggestionState.ts
@@ -4,10 +4,14 @@ import { IXSuggestionStateType } from './types/suggestionType';
 import { setsEqual } from './data_utils/setUtils';
 import {
   propertyIsMultiselect,
+  propertyIsRelationship,
   propertyIsSelect,
   propertyIsSelectOrMultiSelect,
 } from './propertyTypes';
 
+const propertyIsMultiValued = (propertyType: PropertySchema['type']) =>
+  propertyIsMultiselect(propertyType) || propertyIsRelationship(propertyType);
+
 type CurrentValue = string | number | null;
 
 interface SuggestionValues {
@@ -27,6 +31,7 @@ const sameValueSet = (first: any, second: any) => setsEqual(first || [], second
 const EQUALITIES: Record<string, (first: any, second: any) => boolean> = {
   date: isSameDate,
   multiselect: sameValueSet,
+  relationship: sameValueSet,
 };
 
 const equalsForType = (type: PropertySchema['type']) => (first: any, second: any) =>
@@ -67,7 +72,7 @@ class IXSuggestionState implements IXSuggestionStateType {
     if (
       labeledValue ||
       (propertyIsSelect(propertyType) && currentValue) ||
-      (propertyIsMultiselect(propertyType) &&
+      (propertyIsMultiValued(propertyType) &&
         Array.isArray(currentValue) &&
         currentValue.length > 0)
     ) {
@@ -76,7 +81,7 @@ class IXSuggestionState implements IXSuggestionStateType {
   }
 
   setWithValue({ currentValue }: SuggestionValues, propertyType: PropertySchema['type']) {
-    if (propertyIsMultiselect(propertyType) && Array.isArray(currentValue)) {
+    if (propertyIsMultiValued(propertyType) && Array.isArray(currentValue)) {
       this.withValue = currentValue?.length > 0;
     } else if (currentValue) {
       this.withValue = true;
@@ -103,7 +108,11 @@ class IXSuggestionState implements IXSuggestionStateType {
   }
 
   setHasContext({ segment }: SuggestionValues, propertyType: PropertySchema['type']) {
-    if (segment || propertyIsSelectOrMultiSelect(propertyType)) {
+    if (
+      segment ||
+      propertyIsSelectOrMultiSelect(propertyType) ||
+      propertyIsRelationship(propertyType)
+    ) {
       this.hasContext = true;
     }
   }
diff --git a/app/shared/propertyTypes.ts b/app/shared/propertyTypes.ts
index 344abd80db..3e4889269b 100644
--- a/app/shared/propertyTypes.ts
+++ b/app/shared/propertyTypes.ts
@@ -49,10 +49,13 @@ const propertyIsMultiselect = (propertyType: PropertySchema['type']) =>
 const propertyIsSelectOrMultiSelect = (propertyType: PropertySchema['type']) =>
   propertyIsSelect(propertyType) || propertyIsMultiselect(propertyType);
 
+const propertyIsRelationship = (propertyType: string) => propertyType === 'relationship';
+
 export {
   propertyTypes,
   getCompatibleTypes,
   propertyIsSelect,
   propertyIsMultiselect,
   propertyIsSelectOrMultiSelect,
+  propertyIsRelationship,
 };
diff --git a/app/shared/specs/stringToTypeOfProperty.spec.ts b/app/shared/specs/stringToTypeOfProperty.spec.ts
deleted file mode 100644
index 0bb0a68978..0000000000
--- a/app/shared/specs/stringToTypeOfProperty.spec.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-import { stringToTypeOfProperty } from 'shared/stringToTypeOfProperty';
-
-it('should convert a string to a date timestamp', () => {
-  expect(stringToTypeOfProperty('January 1, 1999', 'date')).toBe(915148800);
-});
-
-it('should convert a string to a number timestamp', () => {
-  expect(stringToTypeOfProperty('1234', 'numeric')).toBe(1234);
-});
-
-it('should keep the string if not date or numeric', () => {
-  expect(stringToTypeOfProperty('some string', 'select')).toBe('some string');
-});
-
-it('should keep null if the input is null', () => {
-  expect(stringToTypeOfProperty(null, 'date')).toBe(null);
-});
diff --git a/app/shared/stringToTypeOfProperty.ts b/app/shared/stringToTypeOfProperty.ts
deleted file mode 100644
index a9c956b45f..0000000000
--- a/app/shared/stringToTypeOfProperty.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-import date from 'api/utils/date';
-import { PropertySchema } from './types/commonTypes';
-
-const stringToTypeOfProperty = (
-  text: string | null,
-  propertyType: PropertySchema['type'] | undefined,
-  language?: string
-) => {
-  if (!text) return text;
-
-  const trimmedText = text.trim();
-  switch (propertyType) {
-    case 'numeric':
-      return parseFloat(trimmedText) || null;
-    case 'date':
-      return date.dateToSeconds(trimmedText, language);
-    default:
-      return trimmedText;
-  }
-};
-
-export { stringToTypeOfProperty };
diff --git a/app/shared/tsUtils.ts b/app/shared/tsUtils.ts
index e4ef219a7a..819dc93848 100644
--- a/app/shared/tsUtils.ts
+++ b/app/shared/tsUtils.ts
@@ -3,6 +3,8 @@ import { isObject, isString } from 'lodash';
 import ValidationError from 'ajv/dist/runtime/validation_error';
 import { ClientBlobFile } from 'app/istore';
 
+export type Subset<K, T extends K> = T;
+
 export const isBlobFile = (file: unknown): file is ClientBlobFile =>
   isObject(file) && isString((file as ClientBlobFile).data);
 
@@ -31,6 +33,26 @@ export function wrapValidator(validator: any) {
   };
 }
 
+export function syncWrapValidator(validator: any) {
+  return (value: any) => {
+    const valid = validator(value);
+
+    if (!valid) {
+      const { errors } = validator;
+      const e = new ValidationError(errors);
+      e.message = errors
+        .map(
+          ({ instancePath, message }: { instancePath: string; message: string }) =>
+            `${instancePath}: ${message}`
+        )
+        .join('/n');
+      throw e;
+    }
+
+    return valid;
+  };
+}
+
 export async function sleep(ms: number) {
   return new Promise(resolve => {
     setTimeout(resolve, ms);
diff --git a/app/shared/types/suggestionSchema.ts b/app/shared/types/suggestionSchema.ts
index 182ac0358a..f98d29ace1 100644
--- a/app/shared/types/suggestionSchema.ts
+++ b/app/shared/types/suggestionSchema.ts
@@ -7,6 +7,69 @@ import { propertyTypes } from 'shared/propertyTypes';
 
 export const emitSchemaTypes = true;
 
+const commonSuggestionMessageProperties = {
+  tenant: { type: 'string', minLength: 1 },
+  id: { type: 'string', minLength: 1 },
+  xml_file_name: { type: 'string', minLength: 1 },
+};
+
+export const CommonSuggestionSchema = {
+  type: 'object',
+  title: 'CommonSuggestion',
+  properties: {
+    ...commonSuggestionMessageProperties,
+  },
+  required: ['tenant', 'id', 'xml_file_name', 'segment_text'],
+};
+
+export const TextSelectionSuggestionSchema = {
+  type: 'object',
+  title: 'TextSelectionSuggestion',
+  properties: {
+    ...commonSuggestionMessageProperties,
+    text: { type: 'string' },
+    segment_text: { type: 'string' },
+    segments_boxes: {
+      type: 'array',
+      items: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          top: { type: 'number' },
+          left: { type: 'number' },
+          width: { type: 'number' },
+          height: { type: 'number' },
+          page_number: { type: 'number' },
+        },
+        required: ['top', 'left', 'width', 'height', 'page_number'],
+      },
+    },
+  },
+  required: ['tenant', 'id', 'xml_file_name', 'text', 'segment_text', 'segments_boxes'],
+};
+
+export const ValuesSelectionSuggestionSchema = {
+  type: 'object',
+  title: 'ValuesSelectionSuggestion',
+  properties: {
+    ...commonSuggestionMessageProperties,
+    values: {
+      type: 'array',
+      items: {
+        type: 'object',
+        additionalProperties: false,
+        properties: {
+          id: { type: 'string', minLength: 1 },
+          label: { type: 'string', minLength: 1 },
+        },
+        required: ['id', 'label'],
+      },
+    },
+    segment_text: { type: 'string' },
+  },
+  required: ['tenant', 'id', 'xml_file_name', 'values', 'segment_text'],
+};
+
 export const IXSuggestionStateSchema = {
   type: 'object',
   additionalProperties: false,
diff --git a/app/shared/types/suggestionType.d.ts b/app/shared/types/suggestionType.d.ts
index 32cf41df20..a21cdf9ee9 100644
--- a/app/shared/types/suggestionType.d.ts
+++ b/app/shared/types/suggestionType.d.ts
@@ -7,6 +7,13 @@ import {
   SelectionRectanglesSchema,
 } from 'shared/types/commonTypes';
 
+export interface CommonSuggestion {
+  tenant: string;
+  id: string;
+  xml_file_name: string;
+  [k: string]: unknown | undefined;
+}
+
 export interface EntitySuggestionType {
   _id?: ObjectIdSchema;
   entityId: string;
@@ -121,3 +128,31 @@ export interface IXSuggestionsFilter {
   extractorId: ObjectIdSchema;
   customFilter?: SuggestionCustomFilter;
 }
+
+export interface TextSelectionSuggestion {
+  tenant: string;
+  id: string;
+  xml_file_name: string;
+  text: string;
+  segment_text: string;
+  segments_boxes: {
+    top: number;
+    left: number;
+    width: number;
+    height: number;
+    page_number: number;
+  }[];
+  [k: string]: unknown | undefined;
+}
+
+export interface ValuesSelectionSuggestion {
+  tenant: string;
+  id: string;
+  xml_file_name: string;
+  values: {
+    id: string;
+    label: string;
+  }[];
+  segment_text: string;
+  [k: string]: unknown | undefined;
+}
diff --git a/contents/ui-translations/ar.csv b/contents/ui-translations/ar.csv
index de58f862c8..a88f3782be 100644
--- a/contents/ui-translations/ar.csv
+++ b/contents/ui-translations/ar.csv
@@ -5,6 +5,7 @@ Key,Arabic
 2FA,2FA
 2FA Enabled,2FA Enabled
 A generated ID will be the default title.,سيكون معرف تم إنشاؤه العنوان.
+A valid email is required,البريد الإلكتروني مطلوب
 Accept,قبول
 Accept suggestion,Accept suggestion
 Accepted suggestion on entity,Accepted suggestion on entity
@@ -284,13 +285,13 @@ editor,محرر
 Editors,Editors
 Email,بريد إلكتروني
 Email address,عنوان البريد الإلكتروني
-Email is required,البريد الإلكتروني مطلوب
 Email updated,تم تحديث البريد الإلكتروني
 Empty,فارغة
 empty property tip,You won't be able to save an entity if this property is empty.
 Enable,Enable
 Enable this page to be used as an entity view page:,مكن هذه الصفحة لاستخدامها صفحة معاينة الكيان/ الإدخال
 Enter the 6-digit verification code generated by your Authenticator app,Enter the 6-digit verification code generated by your Authenticator app
+Enter your current password to confirm,Enter your current password to confirm
 Entities,الكيانات
 entities,الكيانات
 Entities across all languages,Entities across all languages
diff --git a/contents/ui-translations/en.csv b/contents/ui-translations/en.csv
index 1eb4f25fc6..4672d16782 100644
--- a/contents/ui-translations/en.csv
+++ b/contents/ui-translations/en.csv
@@ -5,6 +5,7 @@ Key,English
 2FA,2FA
 2FA Enabled,2FA Enabled
 A generated ID will be the default title.,A generated ID will be the default title.
+A valid email is required,A valid email is required
 Accept,Accept
 Accept suggestion,Accept suggestion
 Accepted suggestion on entity,Accepted suggestion on entity
@@ -287,13 +288,13 @@ editor,editor
 Editors,Editors
 Email,Email
 Email address,Email address
-Email is required,Email is required
 Email updated,Email updated
 Empty,Empty
 empty property tip,You won't be able to save an entity if this property is empty.
 Enable,Enable
 Enable this page to be used as an entity view page:,Enable this page to be used as an entity view page:
 Enter the 6-digit verification code generated by your Authenticator app,Enter the 6-digit verification code generated by your Authenticator app
+Enter your current password to confirm,Enter your current password to confirm
 Entities,Entities
 entities,entities
 Entities across all languages,Entities across all languages
diff --git a/contents/ui-translations/es.csv b/contents/ui-translations/es.csv
index 1c9aeacae2..e501bdd776 100644
--- a/contents/ui-translations/es.csv
+++ b/contents/ui-translations/es.csv
@@ -5,6 +5,7 @@ Key,Spanish
 2FA,2FA
 2FA Enabled,2FA Enabled
 A generated ID will be the default title.,El ID autogenerado será el título por defecto
+A valid email is required,La dirección de correo electrónico es obligatorio
 Accept,Aceptar
 Accept suggestion,Accept suggestion
 Accepted suggestion on entity,Sugerencia aceptada en la entidad
@@ -283,13 +284,13 @@ editor,Editor
 Editors,Editors
 Email,Correo electrónico
 Email address,Dirección de correo electrónico
-Email is required,La dirección de correo electrónico es obligatorio
 Email updated,Correo electrónico actualizado
 Empty,Vacío
 empty property tip,No podrás guardar una entidad si esta propiedad está vacía.
 Enable,Enable
 Enable this page to be used as an entity view page:,Habilitar a esta página para que se use como página de vista de entidad:
 Enter the 6-digit verification code generated by your Authenticator app,Enter the 6-digit verification code generated by your Authenticator app
+Enter your current password to confirm,Enter your current password to confirm
 Entities,Entidades
 entities,Entidades
 Entities across all languages,Entidades en todos los idiomas
diff --git a/contents/ui-translations/fr.csv b/contents/ui-translations/fr.csv
index 1b0308da40..3a44201bf2 100644
--- a/contents/ui-translations/fr.csv
+++ b/contents/ui-translations/fr.csv
@@ -5,6 +5,7 @@ Key,French
 2FA,2FA
 2FA Enabled,2FA Enabled
 A generated ID will be the default title.,Un identifiant généré sera le titre par défaut.
+A valid email is required,L'email est obligatoire
 Accept,Accepter
 Accept suggestion,Accept suggestion
 Accepted suggestion on entity,Accepted suggestion on entity
@@ -284,13 +285,13 @@ editor,Éditeur
 Editors,Editors
 Email,E-mail
 Email address,Adresse e-mail
-Email is required,L'email est obligatoire
 Email updated,E-mail mis à jour
 Empty,Vide
 empty property tip,You won't be able to save an entity if this property is empty.
 Enable,Enable
 Enable this page to be used as an entity view page:,Activez cette page pour qu'elle soit utilisée comme page de visualisation des entités :
 Enter the 6-digit verification code generated by your Authenticator app,Enter the 6-digit verification code generated by your Authenticator app
+Enter your current password to confirm,Enter your current password to confirm
 Entities,Entités
 entities,Entités
 Entities across all languages,Entities across all languages
diff --git a/contents/ui-translations/ko.csv b/contents/ui-translations/ko.csv
index d33390c871..2408a616d0 100644
--- a/contents/ui-translations/ko.csv
+++ b/contents/ui-translations/ko.csv
@@ -5,6 +5,7 @@ Key,Korean
 2FA,2FA
 2FA Enabled,2FA Enabled
 A generated ID will be the default title.,생성된 아이디가 기본값으로 설정됩니다.
+A valid email is required,이메일이 필요합니다.
 Accept,수락
 Accept suggestion,Accept suggestion
 Accepted suggestion on entity,Accepted suggestion on entity
@@ -285,13 +286,13 @@ editor,편집자
 Editors,Editors
 Email,이메일
 Email address,이메일 주소
-Email is required,이메일이 필요합니다.
 Email updated,이메일 업데이트 완료
 Empty,Empty
 empty property tip,You won't be able to save an entity if this property is empty.
 Enable,Enable
 Enable this page to be used as an entity view page:,엔티티 뷰 페이지가 필요할 경우 활성화하십시오.
 Enter the 6-digit verification code generated by your Authenticator app,Enter the 6-digit verification code generated by your Authenticator app
+Enter your current password to confirm,Enter your current password to confirm
 Entities,엔티티
 entities,엔티티
 Entities across all languages,Entities across all languages
diff --git a/contents/ui-translations/my.csv b/contents/ui-translations/my.csv
index 2826e823bc..a5396e6c8d 100644
--- a/contents/ui-translations/my.csv
+++ b/contents/ui-translations/my.csv
@@ -5,6 +5,7 @@ Key,Burmese
 2FA,2FA
 2FA Enabled,2FA Enabled
 A generated ID will be the default title.,ထုတ်ပေးသည့် ID သည် ပုံသေမူလ ခေါင်းစဉ် ဖြစ်ပါမည်။
+A valid email is required,အီးမေးလ် လိုအပ်သည်
 Accept,လက်ခံမည်
 Accept suggestion,Accept suggestion
 Accepted suggestion on entity,Accepted suggestion on entity
@@ -285,13 +286,13 @@ editor,အယ်ဒီတာ
 Editors,Editors
 Email,အီးမေးလ်
 Email address,အီးမေးလ် လိပ်စာ
-Email is required,အီးမေးလ် လိုအပ်သည်
 Email updated,အီးမေးလ် အပ်ဒိတ်လုပ်ပြီး
 Empty,Empty
 empty property tip,You won't be able to save an entity if this property is empty.
 Enable,Enable
 Enable this page to be used as an entity view page:,ဖြည့်သွင်းချက် ကြည့်ရန်အတွက် စာမျက်နှာအဖြစ် သုံးရန် ဤစာမျက်နှာကို ဖွင့်ထားပါ-
 Enter the 6-digit verification code generated by your Authenticator app,Enter the 6-digit verification code generated by your Authenticator app
+Enter your current password to confirm,Enter your current password to confirm
 Entities,ဖြည့်သွင်းချက်များ
 entities,ဖြည့်သွင်းချက်များ
 Entities across all languages,Entities across all languages
diff --git a/contents/ui-translations/ru.csv b/contents/ui-translations/ru.csv
index 3b58d052fc..241d9fcc22 100644
--- a/contents/ui-translations/ru.csv
+++ b/contents/ui-translations/ru.csv
@@ -5,6 +5,7 @@ Key,Russian
 2FA,2FA
 2FA Enabled,2FA Enabled
 A generated ID will be the default title.,Сгенерированный идентификатор будет назначен заголовком по умолчанию
+A valid email is required,Требутся электронная почта
 Accept,Принять
 Accept suggestion,Accept suggestion
 Accepted suggestion on entity,Accepted suggestion on entity
@@ -282,13 +283,13 @@ editor,Редактор
 Editors,Editors
 Email,Электронная почта
 Email address,Адрес электронной почты
-Email is required,Требутся электронная почта
 Email updated,Электронная почта обновлена
 Empty,Пустой
 empty property tip,You won't be able to save an entity if this property is empty.
 Enable,Enable
 Enable this page to be used as an entity view page:,Сделайте эту страницу доступной для использования в качестве страницы для просмотра объекта:
 Enter the 6-digit verification code generated by your Authenticator app,Enter the 6-digit verification code generated by your Authenticator app
+Enter your current password to confirm,Enter your current password to confirm
 Entities,Объекты
 entities,Объекты
 Entities across all languages,Entities across all languages
diff --git a/contents/ui-translations/th.csv b/contents/ui-translations/th.csv
index 44ed1e65f7..680872e7e8 100644
--- a/contents/ui-translations/th.csv
+++ b/contents/ui-translations/th.csv
@@ -5,6 +5,7 @@ Key,Thai
 2FA,2FA
 2FA Enabled,2FA Enabled
 A generated ID will be the default title.,ID ที่สร้างขึ้นจะเป็นชื่อเริ่มต้น
+A valid email is required,จำเป็นต้องใช้อีเมล
 Accept,ตกลง
 Accept suggestion,Accept suggestion
 Accepted suggestion on entity,Accepted suggestion on entity
@@ -285,13 +286,13 @@ editor,บรรณาธิการ
 Editors,Editors
 Email,อีเมล
 Email address,ที่อยู่อีเมล
-Email is required,จำเป็นต้องใช้อีเมล
 Email updated,อัปเดตอีเมล
 Empty,Empty
 empty property tip,You won't be able to save an entity if this property is empty.
 Enable,Enable
 Enable this page to be used as an entity view page:,เปิดหน้านี้เพื่อใช้เป็นหน้ามุมมองรายการ
 Enter the 6-digit verification code generated by your Authenticator app,Enter the 6-digit verification code generated by your Authenticator app
+Enter your current password to confirm,Enter your current password to confirm
 Entities,รายการ
 entities,รายการ
 Entities across all languages,Entities across all languages
diff --git a/contents/ui-translations/tr.csv b/contents/ui-translations/tr.csv
index a27db083ac..0b4d6ba5d7 100644
--- a/contents/ui-translations/tr.csv
+++ b/contents/ui-translations/tr.csv
@@ -5,6 +5,7 @@ Key,Turkish
 2FA,2FA
 2FA Enabled,2FA Enabled
 A generated ID will be the default title.,"Oluşturulan kimlik, varsayılan başlık olacaktır."
+A valid email is required,E-posta gerekli
 Accept,Kabul Et
 Accept suggestion,Accept suggestion
 Accepted suggestion on entity,Accepted suggestion on entity
@@ -285,13 +286,13 @@ editor,Editör
 Editors,Editors
 Email,E-posta
 Email address,E-posta adresi
-Email is required,E-posta gerekli
 Email updated,E-posta güncellendi
 Empty,Empty
 empty property tip,You won't be able to save an entity if this property is empty.
 Enable,Enable
 Enable this page to be used as an entity view page:,Bu sayfayı varlık görünümü sayfası olarak kullanmak için etkinleştirin:
 Enter the 6-digit verification code generated by your Authenticator app,Enter the 6-digit verification code generated by your Authenticator app
+Enter your current password to confirm,Enter your current password to confirm
 Entities,Varlıklar
 entities,Varlıklar
 Entities across all languages,Entities across all languages
diff --git a/cypress/cypress.d.ts b/cypress/cypress.d.ts
index e7ad13eecb..55bb9fdfba 100644
--- a/cypress/cypress.d.ts
+++ b/cypress/cypress.d.ts
@@ -16,6 +16,7 @@ declare global {
       setSelection(subject: string, query: string | object, endQuery: any[]): Chainable;
       clearAndType(selector: string, value: string, options? = {}): Chainable;
       addTimeLink(duration: number, label: string, index?: number): Chainable;
+      blankState(): Chainable;
       getByTestId(id: string): Chainable<Element>;
       shouldNotBeActionable(
         done: Mocha.Done,
diff --git a/cypress/e2e/helpers/login.ts b/cypress/e2e/helpers/login.ts
index c005b81891..c69deed646 100644
--- a/cypress/e2e/helpers/login.ts
+++ b/cypress/e2e/helpers/login.ts
@@ -2,8 +2,8 @@ const clearCookiesAndLogin = (username?: string, password?: string) => {
   cy.clearAllCookies();
   cy.visit('http://localhost:3000/login');
   cy.contains('Login');
-  cy.get('input[name="username"').type(username || 'admin');
-  cy.get('input[name="password"').type(password || 'admin');
+  cy.get('input[name="username"').type(username || 'admin', { delay: 0 });
+  cy.get('input[name="password"').type(password || 'admin', { delay: 0 });
   cy.intercept('POST', '/api/login').as('login');
   cy.get('button[type="submit"').click();
   cy.wait('@login');
diff --git a/cypress/e2e/settings/account.cy.ts b/cypress/e2e/settings/account.cy.ts
index eb15b37db3..ce1c86bee2 100644
--- a/cypress/e2e/settings/account.cy.ts
+++ b/cypress/e2e/settings/account.cy.ts
@@ -4,8 +4,7 @@ import { clearCookiesAndLogin } from '../helpers/login';
 
 describe('Account', () => {
   before(() => {
-    const env = { DATABASE_NAME: 'uwazi_e2e', INDEX_NAME: 'uwazi_e2e' };
-    cy.exec('yarn blank-state --force', { env });
+    cy.blankState();
     clearCookiesAndLogin('admin', 'change this password now');
     cy.get('.only-desktop a[aria-label="Settings"]').click();
     cy.injectAxe();
@@ -27,18 +26,61 @@ describe('Account', () => {
   });
 
   describe('Update user', () => {
-    it('should change the password to a new one', () => {
+    it('should validate user has email', () => {
+      cy.contains('button', 'Update').should('be.disabled');
+      cy.get('input[name=email]').type('wrong.com');
+      cy.contains('button', 'Update').click();
+      cy.contains('A valid email is required');
+      cy.get('input[name=email]').clear();
       cy.get('input[name=email]').type('admin@uwazi.io', { delay: 0 });
+    });
+
+    it('should validate passwords match', () => {
       cy.get('input[name=password]').type('1234', { delay: 0 });
       cy.get('input[name=passwordConfirm]').type('123', { delay: 0 });
       cy.contains('button', 'Update').click();
       cy.contains('Passwords do not match');
       cy.get('input[name=passwordConfirm]').type('4');
+    });
 
+    it('should save the changes', () => {
       cy.intercept('POST', '/api/users').as('updateUser');
       cy.contains('Update').click();
+
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.contains('Confirm');
+        cy.get('input').type('change this password now');
+        cy.contains('button', 'Accept').click();
+      });
+
       cy.wait('@updateUser');
       cy.contains('Dismiss').click();
+      cy.get('input[name=email]').should('contain.value', 'admin@uwazi.io');
+    });
+
+    it('should not save changes when the password is wrong', () => {
+      cy.get('input[name=password]').type('12345', { delay: 0 });
+      cy.get('input[name=passwordConfirm]').type('12345', { delay: 0 });
+      cy.get('input[name=email]').clear();
+      cy.get('input[name=email]').type('admin@uwazi.io.com', { delay: 0 });
+      cy.contains('button', 'Update').click();
+
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.contains('Confirm');
+        cy.get('input').type('wrong pass');
+        cy.contains('button', 'Accept').click();
+      });
+
+      cy.get('input[name=email]').should('contain.value', 'admin@uwazi.io.com');
+      cy.get('input[name=password]').should('not.contain.value');
+      cy.get('input[name=passwordConfirm]').should('not.contain.value');
+    });
+
+    it('should check the error and dismiss the notification', () => {
+      cy.contains('An error occurred');
+      cy.contains('button', 'View more').click();
+      cy.contains('Request failed with status code 403: Forbidden');
+      cy.contains('button', 'Dismiss').click();
     });
 
     it('should login with the new password', () => {
diff --git a/cypress/e2e/settings/activitylog.cy.ts b/cypress/e2e/settings/activitylog.cy.ts
index b56899f1d3..02cce9280b 100644
--- a/cypress/e2e/settings/activitylog.cy.ts
+++ b/cypress/e2e/settings/activitylog.cy.ts
@@ -45,6 +45,10 @@ describe('Activity log', () => {
     cy.contains('button', 'Cancel').click();
     cy.clearAndType('input[name=email]', 'editor@uwazi.com', { delay: 0 });
     cy.contains('button', 'Update').click();
+    cy.get('[data-testid="modal"]').within(() => {
+      cy.get('input').type('editor');
+      cy.contains('button', 'Accept').click();
+    });
   });
 
   it('should pass accessibility check', () => {
diff --git a/cypress/e2e/settings/custom-uploads.cy.ts b/cypress/e2e/settings/custom-uploads.cy.ts
index 46e0cf4c2c..eaa2f0093b 100644
--- a/cypress/e2e/settings/custom-uploads.cy.ts
+++ b/cypress/e2e/settings/custom-uploads.cy.ts
@@ -3,8 +3,7 @@ import { clearCookiesAndLogin } from '../helpers/login';
 
 describe('customization', () => {
   before(() => {
-    const env = { DATABASE_NAME: 'uwazi_e2e', INDEX_NAME: 'uwazi_e2e' };
-    cy.exec('yarn blank-state --force', { env });
+    cy.blankState();
     clearCookiesAndLogin('admin', 'change this password now');
     cy.injectAxe();
     cy.contains('a', 'Settings').click();
diff --git a/cypress/e2e/settings/customization.cy.ts b/cypress/e2e/settings/customization.cy.ts
index 42b809256a..9427e442ee 100644
--- a/cypress/e2e/settings/customization.cy.ts
+++ b/cypress/e2e/settings/customization.cy.ts
@@ -9,8 +9,7 @@ Cypress.on('window:before:load', win => {
 
 describe('customization', () => {
   before(() => {
-    const env = { DATABASE_NAME: 'uwazi_e2e', INDEX_NAME: 'uwazi_e2e' };
-    cy.exec('yarn blank-state --force', { env });
+    cy.blankState();
     clearCookiesAndLogin('admin', 'change this password now');
     cy.injectAxe();
     cy.contains('a', 'Settings').click();
diff --git a/cypress/e2e/settings/languages.cy.ts b/cypress/e2e/settings/languages.cy.ts
index 46043ee1c8..91c43de4ea 100644
--- a/cypress/e2e/settings/languages.cy.ts
+++ b/cypress/e2e/settings/languages.cy.ts
@@ -12,8 +12,7 @@ const stringToTranslate = "*please keep this key secret and don't share it.";
 
 describe('Languages', () => {
   before(() => {
-    const env = { DATABASE_NAME: 'uwazi_e2e', INDEX_NAME: 'uwazi_e2e' };
-    cy.exec('yarn blank-state --force', { env });
+    cy.blankState();
     clearCookiesAndLogin('admin', 'change this password now');
     cy.get('.only-desktop a[aria-label="Settings"]').click();
     cy.injectAxe();
diff --git a/cypress/e2e/settings/menu.cy.ts b/cypress/e2e/settings/menu.cy.ts
index dc616bcc95..46d8e5be8e 100644
--- a/cypress/e2e/settings/menu.cy.ts
+++ b/cypress/e2e/settings/menu.cy.ts
@@ -4,8 +4,7 @@ import { clearCookiesAndLogin } from '../helpers/login';
 
 describe('Menu configuration', () => {
   before(() => {
-    const env = { DATABASE_NAME: 'uwazi_e2e', INDEX_NAME: 'uwazi_e2e' };
-    cy.exec('yarn blank-state --force', { env });
+    cy.blankState();
     clearCookiesAndLogin('admin', 'change this password now');
     cy.get('.only-desktop a[aria-label="Settings"]').click();
     cy.injectAxe();
diff --git a/cypress/e2e/settings/mobile-settings-menu.cy.ts b/cypress/e2e/settings/mobile-settings-menu.cy.ts
index 576fbcdec9..a4ac3bfbd0 100644
--- a/cypress/e2e/settings/mobile-settings-menu.cy.ts
+++ b/cypress/e2e/settings/mobile-settings-menu.cy.ts
@@ -3,8 +3,7 @@ import 'cypress-axe';
 
 describe('Settings mobile menu', () => {
   before(() => {
-    const env = { DATABASE_NAME: 'uwazi_e2e', INDEX_NAME: 'uwazi_e2e' };
-    cy.exec('yarn blank-state --force', { env });
+    cy.blankState();
   });
 
   beforeEach(() => {
diff --git a/cypress/e2e/settings/relationship-types.cy.ts b/cypress/e2e/settings/relationship-types.cy.ts
index 78ce3e07ed..75d9be131d 100644
--- a/cypress/e2e/settings/relationship-types.cy.ts
+++ b/cypress/e2e/settings/relationship-types.cy.ts
@@ -4,8 +4,7 @@ import { clearCookiesAndLogin } from '../helpers/login';
 
 describe('Relationship Types configuration', () => {
   before(() => {
-    const env = { DATABASE_NAME: 'uwazi_e2e', INDEX_NAME: 'uwazi_e2e' };
-    cy.exec('yarn blank-state --force', { env });
+    cy.blankState();
     clearCookiesAndLogin('admin', 'change this password now');
     cy.get('.only-desktop a[aria-label="Settings"]').click();
     cy.injectAxe();
diff --git a/cypress/e2e/settings/thesauri.cy.ts b/cypress/e2e/settings/thesauri.cy.ts
index 3b917c4c49..f6ee68d134 100644
--- a/cypress/e2e/settings/thesauri.cy.ts
+++ b/cypress/e2e/settings/thesauri.cy.ts
@@ -4,8 +4,7 @@ import { clearCookiesAndLogin } from '../helpers/login';
 
 describe('Thesauri configuration', () => {
   before(() => {
-    const env = { DATABASE_NAME: 'uwazi_e2e', INDEX_NAME: 'uwazi_e2e' };
-    cy.exec('yarn blank-state --force', { env });
+    cy.blankState();
     clearCookiesAndLogin('admin', 'change this password now');
     cy.get('.only-desktop a[aria-label="Settings"]').click();
     cy.injectAxe();
diff --git a/cypress/e2e/settings/users.cy.ts b/cypress/e2e/settings/users.cy.ts
index b318657301..b86510cdb8 100644
--- a/cypress/e2e/settings/users.cy.ts
+++ b/cypress/e2e/settings/users.cy.ts
@@ -10,6 +10,14 @@ const namesShouldMatch = (names: string[]) => {
   });
 };
 
+const checkWorngPasswordState = () => {
+  cy.contains('An error occurred');
+  cy.contains('button', 'View more').click();
+  cy.contains('Request failed with status code 403: Forbidden');
+  cy.contains('button', 'Dismiss').click();
+  cy.get('aside').should('be.visible');
+};
+
 describe('Users', () => {
   before(() => {
     const env = { DATABASE_NAME: 'uwazi_e2e', INDEX_NAME: 'uwazi_e2e' };
@@ -50,6 +58,10 @@ describe('Users', () => {
         });
       });
       cy.contains('button', 'Save').click();
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.get('input').type('admin', { delay: 0 });
+        cy.contains('button', 'Accept').click();
+      });
       cy.contains('span', 'User_1');
       cy.wait('@updateUsers');
       cy.contains('button', 'Dismiss').click();
@@ -64,6 +76,10 @@ describe('Users', () => {
         cy.get('#password').type('secret', { delay: 0 });
       });
       cy.contains('button', 'Save').click();
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.get('input').type('admin', { delay: 0 });
+        cy.contains('button', 'Accept').click();
+      });
       cy.contains('span', 'Carmen_edited');
       cy.contains('button', 'Dismiss').click();
     });
@@ -72,19 +88,37 @@ describe('Users', () => {
       cy.intercept('GET', '/api/users').as('updateUsers');
       cy.contains('td', 'User_1').siblings().first().click();
       cy.contains('button', 'Delete').click();
-      cy.contains('[data-testid="modal"] button', 'Accept').click();
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.contains('li', 'User_1');
+        cy.get('input').type('admin', { delay: 0 });
+        cy.contains('button', 'Accept').click();
+      });
       cy.contains('button', 'Dismiss').click();
       cy.wait('@updateUsers');
       cy.contains('span', 'User_1').should('not.exist');
     });
 
-    it('should check the changes', () => {
-      const titles = ['Carmen_edited', 'Cynthia', 'Mike', 'admin', 'blocky', 'colla', 'editor'];
-      namesShouldMatch(titles);
+    it('should check the changes and the password change for the modified user', () => {
+      namesShouldMatch(['Carmen_edited', 'Cynthia', 'Mike', 'admin', 'blocky', 'colla', 'editor']);
+      clearCookiesAndLogin('User_1', 'does not matter it was deleted');
+      cy.contains('span', 'Login failed');
+      cy.get('input[name="username"]').clear();
+      cy.get('input[name="password"]').clear();
+      cy.get('input[name="username"]').type('Carmen_edited', { delay: 0 });
+      cy.get('input[name="password"]').type('secret', { delay: 0 });
+      cy.get('button[type="submit"').click();
+      cy.contains('Return to login').click();
     });
   });
 
   describe('form validations', () => {
+    before(() => {
+      clearCookiesAndLogin();
+      cy.get('.only-desktop a[aria-label="Settings"]').click();
+      cy.contains('span', 'Users & Groups').click();
+      cy.contains('button', 'Users').click();
+    });
+
     it('check for unique name and email', () => {
       cy.contains('button', 'Add user').click();
       cy.get('aside').within(() => {
@@ -108,11 +142,13 @@ describe('Users', () => {
       cy.get('aside').within(() => {
         cy.get('#username').clear();
         cy.get('#username').type('Al');
+        cy.contains('button', 'Save').click();
         cy.contains('span', 'Username is too short').should('exist');
         cy.get('#username').clear();
         cy.get('#username').type('LongNameForAUserWhatIsTheAdminThinkingWhenCreatingIt', {
           delay: 0,
         });
+        cy.contains('button', 'Save').click();
         cy.contains('span', 'Username is too long').should('exist');
       });
     });
@@ -122,6 +158,7 @@ describe('Users', () => {
         cy.get('#password').type('This passwords has more then 50 chatacters, it should fail.', {
           delay: 0,
         });
+        cy.contains('button', 'Save').click();
         cy.contains('span', 'Password is too long').should('exist');
       });
     });
@@ -129,7 +166,8 @@ describe('Users', () => {
     it('should required email', () => {
       cy.get('aside').within(() => {
         cy.get('#email').clear();
-        cy.contains('span', 'Email is required').should('exist');
+        cy.contains('button', 'Save').click();
+        cy.contains('span', 'A valid email is required').should('exist');
       });
       cy.contains('button', 'Cancel').click();
     });
@@ -155,7 +193,12 @@ describe('Users', () => {
       cy.contains('td', 'blocky').siblings().first().click();
 
       cy.contains('button', 'Reset 2FA').click();
-      cy.contains('[data-testid="modal"] button', 'Accept').click();
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.contains('li', 'blocky');
+        cy.get('input').type('admin', { delay: 0 });
+        cy.contains('button', 'Accept').click();
+      });
+
       cy.get('table tbody tr')
         .eq(4)
         .within(() => {
@@ -167,12 +210,31 @@ describe('Users', () => {
   });
 
   describe('unblock user', () => {
+    it('should not be able to ublock a user if the password is incorrect', () => {
+      cy.contains('td', 'blocky').siblings().contains('button', 'Edit').click();
+
+      cy.contains('button', 'Unlock account').click();
+
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.contains('Confirm action');
+        cy.get('input').type('wroooong!', { delay: 0 });
+        cy.contains('button', 'Accept').click();
+      });
+
+      checkWorngPasswordState();
+    });
+
     it('should unblock a user', () => {
       cy.intercept('GET', '/api/users').as('updateUsers');
 
-      cy.contains('td', 'blocky').siblings().contains('button', 'Edit').click();
-
       cy.contains('button', 'Unlock account').click();
+
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.contains('Confirm action');
+        cy.get('input').type('admin', { delay: 0 });
+        cy.contains('button', 'Accept').click();
+      });
+
       cy.wait('@updateUsers');
     });
 
@@ -185,14 +247,39 @@ describe('Users', () => {
     });
   });
 
-  describe('bulk actions', () => {
-    it('should log back in as admin', () => {
+  describe('change roles', () => {
+    before(() => {
       clearCookiesAndLogin();
       cy.get('.only-desktop a[aria-label="Settings"]').click();
       cy.contains('span', 'Users & Groups').click();
       cy.contains('button', 'Users').click();
     });
 
+    it('should make a collaborator user into an admin', () => {
+      cy.get(':nth-child(6) > :nth-child(6) > button').click();
+      cy.get('aside').within(() => {
+        cy.get('input[name="username"]').clear();
+        cy.get('input[name="username"]').type('admin2', { delay: 0 });
+        cy.get('input[name="password"]').type('password', { delay: 0 });
+        cy.get('#roles').select('admin');
+      });
+      cy.contains('button', 'Save').click();
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.get('input').type('admin', { delay: 0 });
+        cy.contains('button', 'Accept').click();
+      });
+      cy.contains('button', 'Dismiss').click();
+    });
+
+    it('should log in with the new admin user', () => {
+      clearCookiesAndLogin('admin2', 'password');
+      cy.get('.only-desktop a[aria-label="Settings"]').click();
+      cy.contains('span', 'Users & Groups').click();
+      cy.contains('button', 'Users').click();
+    });
+  });
+
+  describe('bulk actions', () => {
     it('bulk password reset', () => {
       cy.contains('td', 'Carmen_edited').siblings().first().click();
       cy.contains('td', 'Cynthia').siblings().first().click();
@@ -203,6 +290,7 @@ describe('Users', () => {
         cy.contains('h1', 'Reset passwords');
         cy.contains('li', 'Carmen_edited');
         cy.contains('li', 'Cynthia');
+        cy.get('input').should('not.exist');
         cy.contains('button', 'Accept').click();
       });
 
@@ -223,6 +311,7 @@ describe('Users', () => {
         cy.contains('h1', 'Reset 2FA');
         cy.contains('li', 'Carmen_edited');
         cy.contains('li', 'Mike');
+        cy.get('input').type('password', { delay: 0 });
         cy.contains('button', 'Accept').click();
       });
 
@@ -260,6 +349,7 @@ describe('Users', () => {
         cy.contains('h1', 'Delete');
         cy.contains('li', 'Carmen_edited');
         cy.contains('li', 'Mike');
+        cy.get('input').type('password', { delay: 0 });
         cy.contains('button', 'Accept').click();
       });
 
@@ -270,7 +360,35 @@ describe('Users', () => {
       cy.contains('span', 'Carmen_edited').should('not.exist');
       cy.contains('span', 'Mike').should('not.exist');
 
-      namesShouldMatch(['Cynthia', 'admin', 'blocky', 'colla', 'editor']);
+      namesShouldMatch(['Cynthia', 'admin', 'admin2', 'blocky', 'editor']);
+    });
+  });
+
+  describe('validate password', () => {
+    it('should not be able to edit another user if the password is incorrect', () => {
+      cy.contains('td', 'Cynthia').siblings().last().click();
+      cy.get('aside').within(() => {
+        cy.get('#password').type('changed password', { delay: 0 });
+        cy.contains('button', 'Save').click();
+      });
+
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.get('input').type('theIncorrectPassword!!', { delay: 0 });
+        cy.contains('button', 'Accept').click();
+      });
+
+      checkWorngPasswordState();
+    });
+
+    it('should not be able to reset 2fa if the password is incorrect', () => {
+      cy.contains('button', 'Reset 2FA').click();
+
+      cy.get('[data-testid="modal"]').within(() => {
+        cy.get('input').type('anotherWorng!!', { delay: 0 });
+        cy.contains('button', 'Accept').click();
+      });
+
+      checkWorngPasswordState();
     });
   });
 });
diff --git a/cypress/support/commands.js b/cypress/support/commands.js
index 107b4f2e15..c8247e76a5 100644
--- a/cypress/support/commands.js
+++ b/cypress/support/commands.js
@@ -178,4 +178,13 @@ Cypress.Commands.add('addTimeLink', (duration, label, index = 0) => {
   cy.get(timeLinkSelector).type(label);
 });
 
+Cypress.Commands.add('blankState', () => {
+  const env = { DATABASE_NAME: 'uwazi_e2e', INDEX_NAME: 'uwazi_e2e' };
+  cy.exec('yarn blank-state --force', { env, failOnNonZeroExit: false }).then(result => {
+    if (result.code === 1) {
+      cy.exec('yarn blank-state --force', { env });
+    }
+  });
+});
+
 export {};
diff --git a/package.json b/package.json
index 0bec6cdc4f..a8d9735eed 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "uwazi",
-  "version": "1.171.1",
+  "version": "1.172.0",
   "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.",
   "keywords": [
     "react"
@@ -186,13 +186,13 @@
     "pdfjs-dist": "^4.0.379",
     "postcss-loader": "^8.1.1",
     "postcss-prefix-selector": "^1.16.0",
-    "prom-client": "^15.1.1",
+    "prom-client": "^15.1.2",
     "prop-types": "^15.8.1",
     "qrcode.react": "^3.1.0",
     "qs": "^6.12.1",
     "react": "^18.3.1",
     "react-color": "^2.19.3",
-    "react-datepicker": "6.6.0",
+    "react-datepicker": "6.9.0",
     "react-device-detect": "^2.2.3",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
@@ -209,7 +209,7 @@
     "react-redux": "5.0.6",
     "react-redux-form": "^1.16.14",
     "react-render-if-visible": "^2.1.1",
-    "react-router-dom": "6.23.0",
+    "react-router-dom": "6.23.1",
     "react-table": "^7.8.0",
     "react-table-sticky": "^1.1.3",
     "react-tabs": "^6.0.2",
@@ -261,7 +261,7 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/plugin-transform-modules-commonjs": "^7.24.1",
     "@babel/plugin-transform-react-constant-elements": "^7.24.1",
-    "@babel/plugin-transform-react-inline-elements": "^7.24.1",
+    "@babel/plugin-transform-react-inline-elements": "^7.24.7",
     "@babel/preset-env": "^7.24.7",
     "@babel/preset-react": "^7.24.7",
     "@babel/preset-typescript": "^7.24.7",
@@ -335,14 +335,14 @@
     "clean-webpack-plugin": "4.0.0",
     "copy-webpack-plugin": "12.0.2",
     "css-loader": "^7.1.2",
-    "css-minimizer-webpack-plugin": "^6.0.0",
+    "css-minimizer-webpack-plugin": "^7.0.0",
     "cypress": "13.6.4",
     "cypress-axe": "^1.5.0",
     "cypress-plugin-snapshots": "^1.4.4",
     "cypress-real-events": "^1.12.0",
     "enzyme": "3.11.0",
     "enzyme-to-json": "^3.6.2",
-    "eslint": "v8.56.0",
+    "eslint": "v8.57.0",
     "eslint-config-airbnb": "19.0.4",
     "eslint-plugin-cypress": "^3.1.1",
     "eslint-plugin-import": "v2.29.1",
@@ -376,7 +376,7 @@
     "redux-mock-store": "^1.5.4",
     "rtlcss-webpack-plugin": "4.0.7",
     "sass": "^1.74.1",
-    "sass-loader": "14.2.0",
+    "sass-loader": "14.2.1",
     "sharp": "^0.33.2",
     "storybook": "^8.0.10",
     "stream-mock": "^2.0.5",
diff --git a/yarn.lock b/yarn.lock
index 64ce10e662..bea302de13 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -713,7 +713,7 @@
     "@jridgewell/trace-mapping" "^0.3.25"
     jsesc "^2.5.1"
 
-"@babel/helper-annotate-as-pure@^7.22.5", "@babel/helper-annotate-as-pure@^7.24.7":
+"@babel/helper-annotate-as-pure@^7.24.7":
   version "7.24.7"
   resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.24.7.tgz#5373c7bc8366b12a033b4be1ac13a206c6656aab"
   integrity sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==
@@ -728,13 +728,13 @@
     "@babel/traverse" "^7.24.7"
     "@babel/types" "^7.24.7"
 
-"@babel/helper-builder-react-jsx@^7.22.10":
-  version "7.22.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.22.10.tgz#591b1b44a80eb16123b46ad55e9ba42335d6f103"
-  integrity sha512-cZr0nzCwrMp7Z8owt+YN8OncOqhG1eZLp/aRT5ftBnkLJTCB3Dnq/t52vSfWc6sGRWdDeawbksuh3pYQGCzVwA==
+"@babel/helper-builder-react-jsx@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.24.7.tgz#28ff89b64f1b3ccdb6f755550bc3b6ea0c8ac9a5"
+  integrity sha512-k87H7LeQijAXxI6gGWRbf+PAOZTn8jFr6SPgPrALrebOQYC+pVELsolqgRJrG6wWQIsAlZezB/pHnyvfgsCA9A==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.22.5"
-    "@babel/types" "^7.22.10"
+    "@babel/helper-annotate-as-pure" "^7.24.7"
+    "@babel/types" "^7.24.7"
 
 "@babel/helper-call-delegate@^7.12.13":
   version "7.12.13"
@@ -1502,13 +1502,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.24.7"
 
-"@babel/plugin-transform-react-inline-elements@^7.24.1":
-  version "7.24.1"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.24.1.tgz#5bab2918cae9f0847ce11f494252c49aa87f1c26"
-  integrity sha512-h5t0Fzym5KNCafHV81JQ2ejX9lySgq0AeVlrMrdxMF2K8555bO0o/cdPgwOCbg4lC4BFq/FZyqg2DUXzyFa89A==
+"@babel/plugin-transform-react-inline-elements@^7.24.7":
+  version "7.24.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-inline-elements/-/plugin-transform-react-inline-elements-7.24.7.tgz#52f215336738a05dc35b6446fcbc3d90ccbd4d2a"
+  integrity sha512-dh68Uv0h2Tpyo2j7GwuL1u/OTcSu3E9WuzlnIovJuE9BsOT9d97wH63+DcBamqhYGgIHvvWBoOgZlkwUDNrL3Q==
   dependencies:
-    "@babel/helper-builder-react-jsx" "^7.22.10"
-    "@babel/helper-plugin-utils" "^7.24.0"
+    "@babel/helper-builder-react-jsx" "^7.24.7"
+    "@babel/helper-plugin-utils" "^7.24.7"
 
 "@babel/plugin-transform-react-jsx-development@^7.24.7":
   version "7.24.7"
@@ -1804,7 +1804,7 @@
     debug "^4.3.1"
     globals "^11.1.0"
 
-"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.16.7", "@babel/types@^7.18.9", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.23.0", "@babel/types@^7.24.7", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
+"@babel/types@^7.0.0", "@babel/types@^7.12.13", "@babel/types@^7.16.7", "@babel/types@^7.18.9", "@babel/types@^7.20.7", "@babel/types@^7.23.0", "@babel/types@^7.24.7", "@babel/types@^7.3.3", "@babel/types@^7.4.4":
   version "7.24.7"
   resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.24.7.tgz#6027fe12bc1aa724cd32ab113fb7f1988f1f66f2"
   integrity sha512-XEFXSlxiG5td2EJRe8vOmRbaXVgfcBlszKujvVmWIK/UpywWljQCfzAv3RQCGujWQ1RD4YYWEAqDXfuJiy8f5Q==
@@ -2087,10 +2087,10 @@
     minimatch "^3.1.2"
     strip-json-comments "^3.1.1"
 
-"@eslint/js@8.56.0":
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.56.0.tgz#ef20350fec605a7f7035a01764731b2de0f3782b"
-  integrity sha512-gMsVel9D7f2HLkBma9VbtzZRehRogVRfbr++f06nL2vnCGCNlzOD+/MUov/F4p8myyAHspEhVobgjpX64q5m6A==
+"@eslint/js@8.57.0":
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/@eslint/js/-/js-8.57.0.tgz#a5417ae8427873f1dd08b70b3574b453e67b5f7f"
+  integrity sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==
 
 "@fal-works/esbuild-plugin-global-externals@^2.1.2":
   version "2.1.2"
@@ -2225,13 +2225,13 @@
   resolved "https://registry.yarnpkg.com/@hookform/error-message/-/error-message-2.0.1.tgz#6a37419106e13664ad6a29c9dae699ae6cd276b8"
   integrity sha512-U410sAr92xgxT1idlu9WWOVjndxLdgPUHEB8Schr27C9eh7/xUnITWpCMF93s+lGiG++D4JnbSnrb5A21AdSNg==
 
-"@humanwhocodes/config-array@^0.11.13":
-  version "0.11.13"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.13.tgz#075dc9684f40a531d9b26b0822153c1e832ee297"
-  integrity sha512-JSBDMiDKSzQVngfRjOdFXgFfklaXI4K9nLF49Auh21lmBWRLIK3+xTErTWD4KU54pb6coM6ESE7Awz/FNU3zgQ==
+"@humanwhocodes/config-array@^0.11.14":
+  version "0.11.14"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.11.14.tgz#d78e481a039f7566ecc9660b4ea7fe6b1fec442b"
+  integrity sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==
   dependencies:
-    "@humanwhocodes/object-schema" "^2.0.1"
-    debug "^4.1.1"
+    "@humanwhocodes/object-schema" "^2.0.2"
+    debug "^4.3.1"
     minimatch "^3.0.5"
 
 "@humanwhocodes/module-importer@^1.0.1":
@@ -2239,10 +2239,10 @@
   resolved "https://registry.yarnpkg.com/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz#af5b2691a22b44be847b0ca81641c5fb6ad0172c"
   integrity sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==
 
-"@humanwhocodes/object-schema@^2.0.1":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044"
-  integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw==
+"@humanwhocodes/object-schema@^2.0.2":
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz#4a2868d75d6d6963e423bcf90b7fd1be343409d3"
+  integrity sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==
 
 "@huridocs/react-text-selection-handler@^0.2.11":
   version "0.2.11"
@@ -2979,7 +2979,7 @@
     "@jridgewell/resolve-uri" "^3.0.3"
     "@jridgewell/sourcemap-codec" "^1.4.10"
 
-"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.21", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.9":
+"@jridgewell/trace-mapping@^0.3.12", "@jridgewell/trace-mapping@^0.3.18", "@jridgewell/trace-mapping@^0.3.20", "@jridgewell/trace-mapping@^0.3.24", "@jridgewell/trace-mapping@^0.3.25", "@jridgewell/trace-mapping@^0.3.9":
   version "0.3.25"
   resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz#15f190e98895f3fc23276ee14bc76b675c2e50f0"
   integrity sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==
@@ -3154,12 +3154,7 @@
   resolved "https://registry.yarnpkg.com/@react-dnd/shallowequal/-/shallowequal-4.0.2.tgz#d1b4befa423f692fa4abf1c79209702e7d8ae4b4"
   integrity sha512-/RVXdLvJxLg4QKvMoM5WlwNR9ViO9z8B/qPcc+C0Sa/teJY7QG7kJ441DwzOjMYEY7GmU4dj5EcGHIkKZiQZCA==
 
-"@remix-run/router@1.16.0":
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.16.0.tgz#0e10181e5fec1434eb071a9bc4bdaac843f16dcc"
-  integrity sha512-Quz1KOffeEf/zwkCBM3kBtH4ZoZ+pT3xIXBG4PPW/XFtDP7EGhtTiC2+gpL9GnR7+Qdet5Oa6cYSvwKYg6kN9Q==
-
-"@remix-run/router@^1.16.1":
+"@remix-run/router@1.16.1", "@remix-run/router@^1.16.1":
   version "1.16.1"
   resolved "https://registry.yarnpkg.com/@remix-run/router/-/router-1.16.1.tgz#73db3c48b975eeb06d0006481bde4f5f2d17d1cd"
   integrity sha512-es2g3dq6Nb07iFxGk5GuHN20RwBZOsuDQN7izWIisUcv9r+d2C5jQxqmgkdebXgReWfiyUabcki6Fg77mSNrig==
@@ -6658,11 +6653,11 @@ brace-expansion@^2.0.1:
     balanced-match "^1.0.0"
 
 braces@^3.0.2, braces@~3.0.2:
-  version "3.0.2"
-  resolved "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz"
-  integrity sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/braces/-/braces-3.0.3.tgz#490332f40919452272d55a8480adc0c441358789"
+  integrity sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==
   dependencies:
-    fill-range "^7.0.1"
+    fill-range "^7.1.1"
 
 brorand@^1.0.1, brorand@^1.1.0:
   version "1.1.0"
@@ -7280,10 +7275,10 @@ color@^4.2.3:
     color-convert "^2.0.1"
     color-string "^1.9.0"
 
-colord@^2.9.1:
-  version "2.9.2"
-  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.2.tgz#25e2bacbbaa65991422c07ea209e2089428effb1"
-  integrity sha512-Uqbg+J445nc1TKn4FoDPS6ZZqAvEDnwrH42yo8B40JSOgSLxMZ/gt3h4nmCtPLQeXhjJJkqBx7SCY35WnIixaQ==
+colord@^2.9.3:
+  version "2.9.3"
+  resolved "https://registry.yarnpkg.com/colord/-/colord-2.9.3.tgz#4f8ce919de456f1d5c1c368c307fe20f3e59fb43"
+  integrity sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==
 
 colorette@^2.0.10, colorette@^2.0.14, colorette@^2.0.16, colorette@^2.0.19:
   version "2.0.20"
@@ -7678,10 +7673,10 @@ crypto-random-string@^2.0.0:
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-2.0.0.tgz#ef2a7a966ec11083388369baa02ebead229b30d5"
   integrity sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==
 
-css-declaration-sorter@^7.1.1:
-  version "7.1.1"
-  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.1.1.tgz#9796bcc257b4647c39993bda8d431ce32b666f80"
-  integrity sha512-dZ3bVTEEc1vxr3Bek9vGwfB5Z6ESPULhcRvO472mfjVnj8jRcTnKO8/JTczlvxM10Myb+wBM++1MtdO76eWcaQ==
+css-declaration-sorter@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-7.2.0.tgz#6dec1c9523bc4a643e088aab8f09e67a54961024"
+  integrity sha512-h70rUM+3PNFuaBDTLe8wF/cdWu+dOZmb7pJt8Z2sedYbAcQVQV/tEchueg3GWxwqS0cxtbxmaHEdkNACqcvsow==
 
 css-loader@^6.7.1:
   version "6.10.0"
@@ -7711,15 +7706,15 @@ css-loader@^7.1.2:
     postcss-value-parser "^4.2.0"
     semver "^7.5.4"
 
-css-minimizer-webpack-plugin@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-6.0.0.tgz#eb79947af785467739375faf7fcb8c2dbf4f06dc"
-  integrity sha512-BLpR9CCDkKvhO3i0oZQgad6v9pCxUuhSc5RT6iUEy9M8hBXi4TJb5vqF2GQ2deqYHmRi3O6IR9hgAZQWg0EBwA==
+css-minimizer-webpack-plugin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-7.0.0.tgz#b77a3d2f7c0fd02d3ac250dcc2f79065363f3cd3"
+  integrity sha512-niy66jxsQHqO+EYbhPuIhqRQ1mNcNVUHrMnkzzir9kFOERJUaQDDRhh7dKDz33kBpkWMF9M8Vx0QlDbc5AHOsw==
   dependencies:
-    "@jridgewell/trace-mapping" "^0.3.21"
-    cssnano "^6.0.3"
+    "@jridgewell/trace-mapping" "^0.3.25"
+    cssnano "^7.0.1"
     jest-worker "^29.7.0"
-    postcss "^8.4.33"
+    postcss "^8.4.38"
     schema-utils "^4.2.0"
     serialize-javascript "^6.0.2"
 
@@ -7790,53 +7785,54 @@ cssesc@^3.0.0:
   resolved "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssnano-preset-default@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-6.0.3.tgz#b4ce755974f4dc8d3d09ac13bb6281cce3ced45e"
-  integrity sha512-4y3H370aZCkT9Ev8P4SO4bZbt+AExeKhh8wTbms/X7OLDo5E7AYUUy6YPxa/uF5Grf+AJwNcCnxKhZynJ6luBA==
-  dependencies:
-    css-declaration-sorter "^7.1.1"
-    cssnano-utils "^4.0.1"
-    postcss-calc "^9.0.1"
-    postcss-colormin "^6.0.2"
-    postcss-convert-values "^6.0.2"
-    postcss-discard-comments "^6.0.1"
-    postcss-discard-duplicates "^6.0.1"
-    postcss-discard-empty "^6.0.1"
-    postcss-discard-overridden "^6.0.1"
-    postcss-merge-longhand "^6.0.2"
-    postcss-merge-rules "^6.0.3"
-    postcss-minify-font-values "^6.0.1"
-    postcss-minify-gradients "^6.0.1"
-    postcss-minify-params "^6.0.2"
-    postcss-minify-selectors "^6.0.2"
-    postcss-normalize-charset "^6.0.1"
-    postcss-normalize-display-values "^6.0.1"
-    postcss-normalize-positions "^6.0.1"
-    postcss-normalize-repeat-style "^6.0.1"
-    postcss-normalize-string "^6.0.1"
-    postcss-normalize-timing-functions "^6.0.1"
-    postcss-normalize-unicode "^6.0.2"
-    postcss-normalize-url "^6.0.1"
-    postcss-normalize-whitespace "^6.0.1"
-    postcss-ordered-values "^6.0.1"
-    postcss-reduce-initial "^6.0.2"
-    postcss-reduce-transforms "^6.0.1"
-    postcss-svgo "^6.0.2"
-    postcss-unique-selectors "^6.0.2"
-
-cssnano-utils@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-4.0.1.tgz#fd18b42f95938bf55ab47967705355d6047bf1da"
-  integrity sha512-6qQuYDqsGoiXssZ3zct6dcMxiqfT6epy7x4R0TQJadd4LWO3sPR6JH6ZByOvVLoZ6EdwPGgd7+DR1EmX3tiXQQ==
+cssnano-preset-default@^7.0.2:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-7.0.2.tgz#65fab7e93d2d28b7b1fd96fbcb0be55dc50f6f87"
+  integrity sha512-z95kGKZx8VWHfERj7LFzuiTxylbvEp07ZEYaFu+t6bFyNOXLd/+3oPyNaY7ISwcrfHFCkt8OfRo4IZxVRJZ7dg==
+  dependencies:
+    browserslist "^4.23.0"
+    css-declaration-sorter "^7.2.0"
+    cssnano-utils "^5.0.0"
+    postcss-calc "^10.0.0"
+    postcss-colormin "^7.0.0"
+    postcss-convert-values "^7.0.0"
+    postcss-discard-comments "^7.0.0"
+    postcss-discard-duplicates "^7.0.0"
+    postcss-discard-empty "^7.0.0"
+    postcss-discard-overridden "^7.0.0"
+    postcss-merge-longhand "^7.0.1"
+    postcss-merge-rules "^7.0.1"
+    postcss-minify-font-values "^7.0.0"
+    postcss-minify-gradients "^7.0.0"
+    postcss-minify-params "^7.0.0"
+    postcss-minify-selectors "^7.0.1"
+    postcss-normalize-charset "^7.0.0"
+    postcss-normalize-display-values "^7.0.0"
+    postcss-normalize-positions "^7.0.0"
+    postcss-normalize-repeat-style "^7.0.0"
+    postcss-normalize-string "^7.0.0"
+    postcss-normalize-timing-functions "^7.0.0"
+    postcss-normalize-unicode "^7.0.0"
+    postcss-normalize-url "^7.0.0"
+    postcss-normalize-whitespace "^7.0.0"
+    postcss-ordered-values "^7.0.0"
+    postcss-reduce-initial "^7.0.0"
+    postcss-reduce-transforms "^7.0.0"
+    postcss-svgo "^7.0.1"
+    postcss-unique-selectors "^7.0.1"
+
+cssnano-utils@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-5.0.0.tgz#b53a0343dd5d21012911882db6ae7d2eae0e3687"
+  integrity sha512-Uij0Xdxc24L6SirFr25MlwC2rCFX6scyUmuKpzI+JQ7cyqDEwD42fJ0xfB3yLfOnRDU5LKGgjQ9FA6LYh76GWQ==
 
-cssnano@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-6.0.3.tgz#46db972da71aa159437287fb4c6bc9c5d3cc5d93"
-  integrity sha512-MRq4CIj8pnyZpcI2qs6wswoYoDD1t0aL28n+41c1Ukcpm56m1h6mCexIHBGjfZfnTqtGSSCP4/fB1ovxgjBOiw==
+cssnano@^7.0.1:
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-7.0.2.tgz#a36578a30aaf3d90da2a95cbebd41d9178d81bd6"
+  integrity sha512-LXm/Xx6TNLzfHM2lBaIQHfvtdW5QfdbyLzfJAWZrclCAb47yVa0/yJG69+amcw3Lq0YZ+kyU40rbsMPLcMt9aw==
   dependencies:
-    cssnano-preset-default "^6.0.3"
-    lilconfig "^3.0.0"
+    cssnano-preset-default "^7.0.2"
+    lilconfig "^3.1.1"
 
 csso@^5.0.5:
   version "5.0.5"
@@ -9397,16 +9393,16 @@ eslint-visitor-keys@^3.3.0, eslint-visitor-keys@^3.4.1, eslint-visitor-keys@^3.4
   resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz#0cd72fe8550e3c2eae156a96a4dddcd1c8ac5800"
   integrity sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==
 
-eslint@v8.56.0:
-  version "8.56.0"
-  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.56.0.tgz#4957ce8da409dc0809f99ab07a1b94832ab74b15"
-  integrity sha512-Go19xM6T9puCOWntie1/P997aXxFsOi37JIHRWI514Hc6ZnaHGKY9xFhrU65RT6CcBEzZoGG1e6Nq+DT04ZtZQ==
+eslint@v8.57.0:
+  version "8.57.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-8.57.0.tgz#c786a6fd0e0b68941aaf624596fb987089195668"
+  integrity sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==
   dependencies:
     "@eslint-community/eslint-utils" "^4.2.0"
     "@eslint-community/regexpp" "^4.6.1"
     "@eslint/eslintrc" "^2.1.4"
-    "@eslint/js" "8.56.0"
-    "@humanwhocodes/config-array" "^0.11.13"
+    "@eslint/js" "8.57.0"
+    "@humanwhocodes/config-array" "^0.11.14"
     "@humanwhocodes/module-importer" "^1.0.1"
     "@nodelib/fs.walk" "^1.2.8"
     "@ungap/structured-clone" "^1.2.0"
@@ -9888,10 +9884,10 @@ filesize@^10.0.12, filesize@^10.1.0:
   resolved "https://registry.yarnpkg.com/filesize/-/filesize-10.1.1.tgz#eb98ce885aa73741199748e70e5b7339cc22c5ff"
   integrity sha512-L0cdwZrKlwZQkMSFnCflJ6J2Y+5egO/p3vgRSDQGxQt++QbUZe5gMbRO6kg6gzwQDPvq2Fk9AmoxUNfZ5gdqaQ==
 
-fill-range@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz"
-  integrity sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==
+fill-range@^7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.1.1.tgz#44265d3cac07e3ea7dc247516380643754a05292"
+  integrity sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==
   dependencies:
     to-regex-range "^5.0.1"
 
@@ -12630,10 +12626,10 @@ lilconfig@^2.0.5, lilconfig@^2.1.0:
   resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.1.0.tgz#78e23ac89ebb7e1bfbf25b18043de756548e7f52"
   integrity sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==
 
-lilconfig@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.0.0.tgz#f8067feb033b5b74dab4602a5f5029420be749bc"
-  integrity sha512-K2U4W2Ff5ibV7j7ydLr+zLAkIg5JJ4lPn1Ltsdt+Tz/IjQ8buJ55pZAxoP34lqIiwtF9iAvtLv3JGv7CAyAg+g==
+lilconfig@^3.1.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-3.1.2.tgz#e4a7c3cb549e3a606c8dcc32e5ae1005e62c05cb"
+  integrity sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==
 
 lines-and-columns@^1.1.6:
   version "1.1.6"
@@ -14411,51 +14407,51 @@ possible-typed-array-names@^1.0.0:
   resolved "https://registry.yarnpkg.com/possible-typed-array-names/-/possible-typed-array-names-1.0.0.tgz#89bb63c6fada2c3e90adc4a647beeeb39cc7bf8f"
   integrity sha512-d7Uw+eZoloe0EHDIYoe+bQ5WXnGMOpmiZFTuMWCwpjzzkL2nTjcKiAk4hh8TjnGye2TwWOk3UXucZ+3rbmBa8Q==
 
-postcss-calc@^9.0.1:
-  version "9.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-9.0.1.tgz#a744fd592438a93d6de0f1434c572670361eb6c6"
-  integrity sha512-TipgjGyzP5QzEhsOZUaIkeO5mKeMFpebWzRogWG/ysonUlnHcq5aJe0jOjpfzUU8PeSaBQnrE8ehR0QA5vs8PQ==
+postcss-calc@^10.0.0:
+  version "10.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-10.0.0.tgz#aca29a1c66dd481ca30d08f6932b1274a1003716"
+  integrity sha512-OmjhudoNTP0QleZCwl1i6NeBwN+5MZbY5ersLZz69mjJiDVv/p57RjRuKDkHeDWr4T+S97wQfsqRTNoDHB2e3g==
   dependencies:
-    postcss-selector-parser "^6.0.11"
+    postcss-selector-parser "^6.0.16"
     postcss-value-parser "^4.2.0"
 
-postcss-colormin@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-6.0.2.tgz#2af9ce753937b08e058dbc6879e4aedfab42806b"
-  integrity sha512-TXKOxs9LWcdYo5cgmcSHPkyrLAh86hX1ijmyy6J8SbOhyv6ua053M3ZAM/0j44UsnQNIWdl8gb5L7xX2htKeLw==
+postcss-colormin@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-7.0.0.tgz#76b9e40eff69a363c1fc5ce2f0ece1d4a01d1de8"
+  integrity sha512-5CN6fqtsEtEtwf3mFV3B4UaZnlYljPpzmGeDB4yCK067PnAtfLe9uX2aFZaEwxHE7HopG5rUkW8gyHrNAesHEg==
   dependencies:
-    browserslist "^4.22.2"
+    browserslist "^4.23.0"
     caniuse-api "^3.0.0"
-    colord "^2.9.1"
+    colord "^2.9.3"
     postcss-value-parser "^4.2.0"
 
-postcss-convert-values@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-6.0.2.tgz#c4a7509aeb1cc7ac3f6948fcbffc2bf8cac7c56a"
-  integrity sha512-aeBmaTnGQ+NUSVQT8aY0sKyAD/BaLJenEKZ03YK0JnDE1w1Rr8XShoxdal2V2H26xTJKr3v5haByOhJuyT4UYw==
+postcss-convert-values@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-7.0.0.tgz#4a53e79c4bd81cfed8a7ed3fffb7b255a2f5f300"
+  integrity sha512-bMuzDgXBbFbByPgj+/r6va8zNuIDUaIIbvAFgdO1t3zdgJZ77BZvu6dfWyd6gHEJnYzmeVr9ayUsAQL3/qLJ0w==
   dependencies:
-    browserslist "^4.22.2"
+    browserslist "^4.23.0"
     postcss-value-parser "^4.2.0"
 
-postcss-discard-comments@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-6.0.1.tgz#46176212bd9c3e5f48aa4b8b4868786726c41d36"
-  integrity sha512-f1KYNPtqYLUeZGCHQPKzzFtsHaRuECe6jLakf/RjSRqvF5XHLZnM2+fXLhb8Qh/HBFHs3M4cSLb1k3B899RYIg==
+postcss-discard-comments@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-7.0.0.tgz#3919e4237630f74927f3976ac5789cfc26731494"
+  integrity sha512-xpSdzRqYmy4YIVmjfGyYXKaI1SRnK6CTr+4Zmvyof8ANwvgfZgGdVtmgAvzh59gJm808mJCWQC9tFN0KF5dEXA==
 
-postcss-discard-duplicates@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-6.0.1.tgz#112b1a95948e69b3484fdd43584dda6930977939"
-  integrity sha512-1hvUs76HLYR8zkScbwyJ8oJEugfPV+WchpnA+26fpJ7Smzs51CzGBHC32RS03psuX/2l0l0UKh2StzNxOrKCYg==
+postcss-discard-duplicates@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.0.tgz#47ae1154cc89ad0a50099fbac1f74c942214c961"
+  integrity sha512-bAnSuBop5LpAIUmmOSsuvtKAAKREB6BBIYStWUTGq8oG5q9fClDMMuY8i4UPI/cEcDx2TN+7PMnXYIId20UVDw==
 
-postcss-discard-empty@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-6.0.1.tgz#b34cb45ec891246da4506b53e352390fdef126c4"
-  integrity sha512-yitcmKwmVWtNsrrRqGJ7/C0YRy53i0mjexBDQ9zYxDwTWVBgbU4+C9jIZLmQlTDT9zhml+u0OMFJh8+31krmOg==
+postcss-discard-empty@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-7.0.0.tgz#218829d1ef0a5d5142dd62f0aa60e00e599d2033"
+  integrity sha512-e+QzoReTZ8IAwhnSdp/++7gBZ/F+nBq9y6PomfwORfP7q9nBpK5AMP64kOt0bA+lShBFbBDcgpJ3X4etHg4lzA==
 
-postcss-discard-overridden@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-6.0.1.tgz#c63c559237758d74bc505452393a64dda9b19ef4"
-  integrity sha512-qs0ehZMMZpSESbRkw1+inkf51kak6OOzNRaoLd/U7Fatp0aN2HQ1rxGOrJvYcRAN9VpX8kUF13R2ofn8OlvFVA==
+postcss-discard-overridden@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-7.0.0.tgz#b123ea51e3d4e1d0a254cf71eaff1201926d319c"
+  integrity sha512-GmNAzx88u3k2+sBTZrJSDauR0ccpE24omTQCVmaTTZFz1du6AasspjaUPMJ2ud4RslZpoFKyf+6MSPETLojc6w==
 
 postcss-import@^15.1.0:
   version "15.1.0"
@@ -14490,55 +14486,55 @@ postcss-loader@^8.1.1:
     jiti "^1.20.0"
     semver "^7.5.4"
 
-postcss-merge-longhand@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-6.0.2.tgz#cd4e83014851da59545e9a906b245615550f4064"
-  integrity sha512-+yfVB7gEM8SrCo9w2lCApKIEzrTKl5yS1F4yGhV3kSim6JzbfLGJyhR1B6X+6vOT0U33Mgx7iv4X9MVWuaSAfw==
+postcss-merge-longhand@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-7.0.1.tgz#5ea565f9fd13e81c92eceea6bdbe405e22250aea"
+  integrity sha512-qZlD26hnqSTMxSSOMS8+QCeRWtqOdMKeQHvHcBhjL3mJxKUs47cvO1Y1x3iTdYIk3ioMcRHTiy229TT0mEMH/A==
   dependencies:
     postcss-value-parser "^4.2.0"
-    stylehacks "^6.0.2"
+    stylehacks "^7.0.1"
 
-postcss-merge-rules@^6.0.3:
-  version "6.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-6.0.3.tgz#08fcf714faaad75b1980ecd961b080ae2f8ddeb3"
-  integrity sha512-yfkDqSHGohy8sGYIJwBmIGDv4K4/WrJPX355XrxQb/CSsT4Kc/RxDi6akqn5s9bap85AWgv21ArcUWwWdGNSHA==
+postcss-merge-rules@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-7.0.1.tgz#7666fc259eb8af7b8bc89e02fa60c73d4e0c7c84"
+  integrity sha512-bb8McYQbo2etgs0uVt6AfngajACK3FHSVP3sGLhprrjbtHJWgG03JZ4KKBlJ8/5Fb8/Rr+mMKaybMYeoYrAg0A==
   dependencies:
-    browserslist "^4.22.2"
+    browserslist "^4.23.0"
     caniuse-api "^3.0.0"
-    cssnano-utils "^4.0.1"
-    postcss-selector-parser "^6.0.15"
+    cssnano-utils "^5.0.0"
+    postcss-selector-parser "^6.1.0"
 
-postcss-minify-font-values@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-6.0.1.tgz#788eb930168be90225f3937f0b70aa19d8b532b2"
-  integrity sha512-tIwmF1zUPoN6xOtA/2FgVk1ZKrLcCvE0dpZLtzyyte0j9zUeB8RTbCqrHZGjJlxOvNWKMYtunLrrl7HPOiR46w==
+postcss-minify-font-values@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-7.0.0.tgz#d16a75a2548e000779566b3568fc874ee5d0aa17"
+  integrity sha512-2ckkZtgT0zG8SMc5aoNwtm5234eUx1GGFJKf2b1bSp8UflqaeFzR50lid4PfqVI9NtGqJ2J4Y7fwvnP/u1cQog==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-minify-gradients@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-6.0.1.tgz#4faf1880b483dc37016658aa186b42194ff9b5bc"
-  integrity sha512-M1RJWVjd6IOLPl1hYiOd5HQHgpp6cvJVLrieQYS9y07Yo8itAr6jaekzJphaJFR0tcg4kRewCk3kna9uHBxn/w==
+postcss-minify-gradients@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-7.0.0.tgz#f6d84456e6d49164a55d0e45bb1b1809c6cf0959"
+  integrity sha512-pdUIIdj/C93ryCHew0UgBnL2DtUS3hfFa5XtERrs4x+hmpMYGhbzo6l/Ir5de41O0GaKVpK1ZbDNXSY6GkXvtg==
   dependencies:
-    colord "^2.9.1"
-    cssnano-utils "^4.0.1"
+    colord "^2.9.3"
+    cssnano-utils "^5.0.0"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-params@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-6.0.2.tgz#bd64af642fa5610281b8a9461598bbb91f92ae05"
-  integrity sha512-zwQtbrPEBDj+ApELZ6QylLf2/c5zmASoOuA4DzolyVGdV38iR2I5QRMsZcHkcdkZzxpN8RS4cN7LPskOkTwTZw==
+postcss-minify-params@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-7.0.0.tgz#dfa8263d38570b1116da2c72f69190ea665b17aa"
+  integrity sha512-XOJAuX8Q/9GT1sGxlUvaFEe2H9n50bniLZblXXsAT/BwSfFYvzSZeFG7uupwc0KbKpTnflnQ7aMwGzX6JUWliQ==
   dependencies:
-    browserslist "^4.22.2"
-    cssnano-utils "^4.0.1"
+    browserslist "^4.23.0"
+    cssnano-utils "^5.0.0"
     postcss-value-parser "^4.2.0"
 
-postcss-minify-selectors@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-6.0.2.tgz#62065b38d3453ddc6627ba50e4f4a2154b031aa0"
-  integrity sha512-0b+m+w7OAvZejPQdN2GjsXLv5o0jqYHX3aoV0e7RBKPCsB7TYG5KKWBFhGnB/iP3213Ts8c5H4wLPLMm7z28Sg==
+postcss-minify-selectors@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-7.0.1.tgz#83844f37130c3fb04b4c1382085be84ed56ecc1a"
+  integrity sha512-YfIbGtcgMFquPxV2L/ASs36ZS4DsgfcDX9tQ8cTEIvBTv+0GXFKtcvvpi9tCKto/+DWGWYKMCESFG3Pnan0Feg==
   dependencies:
-    postcss-selector-parser "^6.0.15"
+    postcss-selector-parser "^6.1.0"
 
 postcss-modules-extract-imports@^3.0.0, postcss-modules-extract-imports@^3.1.0:
   version "3.1.0"
@@ -14575,74 +14571,74 @@ postcss-nested@^6.0.1:
   dependencies:
     postcss-selector-parser "^6.0.11"
 
-postcss-normalize-charset@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-6.0.1.tgz#5f70e1eb8bbdbcfcbed060ef70f179e8fef57d0c"
-  integrity sha512-aW5LbMNRZ+oDV57PF9K+WI1Z8MPnF+A8qbajg/T8PP126YrGX1f9IQx21GI2OlGz7XFJi/fNi0GTbY948XJtXg==
+postcss-normalize-charset@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-7.0.0.tgz#92244ae73c31bf8f8885d5f16ff69e857ac6c001"
+  integrity sha512-ABisNUXMeZeDNzCQxPxBCkXexvBrUHV+p7/BXOY+ulxkcjUZO0cp8ekGBwvIh2LbCwnWbyMPNJVtBSdyhM2zYQ==
 
-postcss-normalize-display-values@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-6.0.1.tgz#ff9aa30bbf1283294bfd9cc8b6fb81ff060a7f2d"
-  integrity sha512-mc3vxp2bEuCb4LgCcmG1y6lKJu1Co8T+rKHrcbShJwUmKJiEl761qb/QQCfFwlrvSeET3jksolCR/RZuMURudw==
+postcss-normalize-display-values@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-7.0.0.tgz#01fb50e5e97ef8935363629bea5a6d3b3aac1342"
+  integrity sha512-lnFZzNPeDf5uGMPYgGOw7v0BfB45+irSRz9gHQStdkkhiM0gTfvWkWB5BMxpn0OqgOQuZG/mRlZyJxp0EImr2Q==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-positions@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-6.0.1.tgz#41ffdc72994f024c6cd6e91dbfb40ab9abe6fe90"
-  integrity sha512-HRsq8u/0unKNvm0cvwxcOUEcakFXqZ41fv3FOdPn916XFUrympjr+03oaLkuZENz3HE9RrQE9yU0Xv43ThWjQg==
+postcss-normalize-positions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-7.0.0.tgz#4eebd7c9d3dde40c97b8047cad38124fc844c463"
+  integrity sha512-I0yt8wX529UKIGs2y/9Ybs2CelSvItfmvg/DBIjTnoUSrPxSV7Z0yZ8ShSVtKNaV/wAY+m7bgtyVQLhB00A1NQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-repeat-style@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-6.0.1.tgz#55dc54b6f80305b280a379899a6626e0a07b04a8"
-  integrity sha512-Gbb2nmCy6tTiA7Sh2MBs3fj9W8swonk6lw+dFFeQT68B0Pzwp1kvisJQkdV6rbbMSd9brMlS8I8ts52tAGWmGQ==
+postcss-normalize-repeat-style@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-7.0.0.tgz#0cb784655d5714d29bd3bda6dee2fb628aa7227b"
+  integrity sha512-o3uSGYH+2q30ieM3ppu9GTjSXIzOrRdCUn8UOMGNw7Af61bmurHTWI87hRybrP6xDHvOe5WlAj3XzN6vEO8jLw==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-string@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-6.0.1.tgz#7605e0fb4ec7bf2709709991d13a949e4419db1d"
-  integrity sha512-5Fhx/+xzALJD9EI26Aq23hXwmv97Zfy2VFrt5PLT8lAhnBIZvmaT5pQk+NuJ/GWj/QWaKSKbnoKDGLbV6qnhXg==
+postcss-normalize-string@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-7.0.0.tgz#a119d3e63a9614570d8413d572fb9fc8c6a64e8c"
+  integrity sha512-w/qzL212DFVOpMy3UGyxrND+Kb0fvCiBBujiaONIihq7VvtC7bswjWgKQU/w4VcRyDD8gpfqUiBQ4DUOwEJ6Qg==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-timing-functions@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-6.0.1.tgz#ef937b7ca2fd62ed0b46645ea5728b842a3600db"
-  integrity sha512-4zcczzHqmCU7L5dqTB9rzeqPWRMc0K2HoR+Bfl+FSMbqGBUcP5LRfgcH4BdRtLuzVQK1/FHdFoGT3F7rkEnY+g==
+postcss-normalize-timing-functions@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-7.0.0.tgz#99d0ee8c4b23b7f4355fafb91385833b9b07108b"
+  integrity sha512-tNgw3YV0LYoRwg43N3lTe3AEWZ66W7Dh7lVEpJbHoKOuHc1sLrzMLMFjP8SNULHaykzsonUEDbKedv8C+7ej6g==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-unicode@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-6.0.2.tgz#361026744ff11baebaec771b60c2a5f36f274fd0"
-  integrity sha512-Ff2VdAYCTGyMUwpevTZPZ4w0+mPjbZzLLyoLh/RMpqUqeQKZ+xMm31hkxBavDcGKcxm6ACzGk0nBfZ8LZkStKA==
+postcss-normalize-unicode@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.0.tgz#bd66bfc238bf4d1eaea356639260c04fce408476"
+  integrity sha512-OnKV52/VFFDAim4n0pdI+JAhsolLBdnCKxE6VV5lW5Q/JeVGFN8UM8ur6/A3EAMLsT1ZRm3fDHh/rBoBQpqi2w==
   dependencies:
-    browserslist "^4.22.2"
+    browserslist "^4.23.0"
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-url@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-6.0.1.tgz#eae58cb4f5f9a4fa5bbbf6d4222dff534ad46186"
-  integrity sha512-jEXL15tXSvbjm0yzUV7FBiEXwhIa9H88JOXDGQzmcWoB4mSjZIsmtto066s2iW9FYuIrIF4k04HA2BKAOpbsaQ==
+postcss-normalize-url@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-7.0.0.tgz#c88cb7cf8952d3ff631e4eba924e7b060ca802f6"
+  integrity sha512-+d7+PpE+jyPX1hDQZYG+NaFD+Nd2ris6r8fPTBAjE8z/U41n/bib3vze8x7rKs5H1uEw5ppe9IojewouHk0klQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-normalize-whitespace@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-6.0.1.tgz#b5933750b938814c028d3d2b2e5c0199e0037b53"
-  integrity sha512-76i3NpWf6bB8UHlVuLRxG4zW2YykF9CTEcq/9LGAiz2qBuX5cBStadkk0jSkg9a9TCIXbMQz7yzrygKoCW9JuA==
+postcss-normalize-whitespace@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-7.0.0.tgz#46b025f0bea72139ddee63015619b0c21cebd845"
+  integrity sha512-37/toN4wwZErqohedXYqWgvcHUGlT8O/m2jVkAfAe9Bd4MzRqlBmXrJRePH0e9Wgnz2X7KymTgTOaaFizQe3AQ==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-ordered-values@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-6.0.1.tgz#553e735d009065b362da93340e57f43d5f2d0fbc"
-  integrity sha512-XXbb1O/MW9HdEhnBxitZpPFbIvDgbo9NK4c/5bOfiKpnIGZDoL2xd7/e6jW5DYLsWxBbs+1nZEnVgnjnlFViaA==
+postcss-ordered-values@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-7.0.0.tgz#cea4e2a140ed1c7b055e0ab967b82a36b584debf"
+  integrity sha512-KROvC63A8UQW1eYDljQe1dtwc1E/M+mMwDT6z7khV/weHYLWTghaLRLunU7x1xw85lWFwVZOAGakxekYvKV+0w==
   dependencies:
-    cssnano-utils "^4.0.1"
+    cssnano-utils "^5.0.0"
     postcss-value-parser "^4.2.0"
 
 postcss-prefix-selector@^1.16.0:
@@ -14650,22 +14646,22 @@ postcss-prefix-selector@^1.16.0:
   resolved "https://registry.yarnpkg.com/postcss-prefix-selector/-/postcss-prefix-selector-1.16.0.tgz#ad5b56f9a73a2c090ca7161049632c9d89bcb404"
   integrity sha512-rdVMIi7Q4B0XbXqNUEI+Z4E+pueiu/CS5E6vRCQommzdQ/sgsS4dK42U7GX8oJR+TJOtT+Qv3GkNo6iijUMp3Q==
 
-postcss-reduce-initial@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-6.0.2.tgz#763d25902406c872264041df69f182eb15a5d9be"
-  integrity sha512-YGKalhNlCLcjcLvjU5nF8FyeCTkCO5UtvJEt0hrPZVCTtRLSOH4z00T1UntQPj4dUmIYZgMj8qK77JbSX95hSw==
+postcss-reduce-initial@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-7.0.0.tgz#a9e64778dd44604c2bda109e2fd14b99ab0d1416"
+  integrity sha512-iqGgmBxY9LrblZ0BKLjmrA1mC/cf9A/wYCCqSmD6tMi+xAyVl0+DfixZIHSVDMbCPRPjNmVF0DFGth/IDGelFQ==
   dependencies:
-    browserslist "^4.22.2"
+    browserslist "^4.23.0"
     caniuse-api "^3.0.0"
 
-postcss-reduce-transforms@^6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-6.0.1.tgz#7bf59d7c6e7066e3b18ef17237d2344bd3da6d75"
-  integrity sha512-fUbV81OkUe75JM+VYO1gr/IoA2b/dRiH6HvMwhrIBSUrxq3jNZQZitSnugcTLDi1KkQh1eR/zi+iyxviUNBkcQ==
+postcss-reduce-transforms@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-7.0.0.tgz#0386080a14e5faad9f8eda33375b79fe7c4f9677"
+  integrity sha512-pnt1HKKZ07/idH8cpATX/ujMbtOGhUfE+m8gbqwJE05aTaNw8gbo34a2e3if0xc0dlu75sUOiqvwCGY3fzOHew==
   dependencies:
     postcss-value-parser "^4.2.0"
 
-postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.15, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
+postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
   version "6.0.15"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.15.tgz#11cc2b21eebc0b99ea374ffb9887174855a01535"
   integrity sha512-rEYkQOMUCEMhsKbK66tbEU9QVIxbhN18YiniAwA7XQYTVBqrBy+P2p5JcdqsHgKM2zWylp8d7J6eszocfds5Sw==
@@ -14673,20 +14669,28 @@ postcss-selector-parser@^6.0.11, postcss-selector-parser@^6.0.15, postcss-select
     cssesc "^3.0.0"
     util-deprecate "^1.0.2"
 
-postcss-svgo@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-6.0.2.tgz#dbc9d03e7f346bc0d82443078602a951e0214836"
-  integrity sha512-IH5R9SjkTkh0kfFOQDImyy1+mTCb+E830+9SV1O+AaDcoHTvfsvt6WwJeo7KwcHbFnevZVCsXhDmjFiGVuwqFQ==
+postcss-selector-parser@^6.0.16, postcss-selector-parser@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.1.0.tgz#49694cb4e7c649299fea510a29fa6577104bcf53"
+  integrity sha512-UMz42UD0UY0EApS0ZL9o1XnLhSTtvvvLe5Dc2H2O56fvRZi+KulDyf5ctDhhtYJBGKStV2FL1fy6253cmLgqVQ==
+  dependencies:
+    cssesc "^3.0.0"
+    util-deprecate "^1.0.2"
+
+postcss-svgo@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-7.0.1.tgz#2b63571d8e9568384df334bac9917baff4d23f58"
+  integrity sha512-0WBUlSL4lhD9rA5k1e5D8EN5wCEyZD6HJk0jIvRxl+FDVOMlJ7DePHYWGGVc5QRqrJ3/06FTXM0bxjmJpmTPSA==
   dependencies:
     postcss-value-parser "^4.2.0"
-    svgo "^3.2.0"
+    svgo "^3.3.2"
 
-postcss-unique-selectors@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-6.0.2.tgz#09a34a5a31a649d3e9bca5962af0616f39d071d2"
-  integrity sha512-8IZGQ94nechdG7Y9Sh9FlIY2b4uS8/k8kdKRX040XHsS3B6d1HrJAkXrBSsSu4SuARruSsUjW3nlSw8BHkaAYQ==
+postcss-unique-selectors@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-7.0.1.tgz#3e4e7c408ca5cd57e834d197e9c96111fc163237"
+  integrity sha512-MH7QE/eKUftTB5ta40xcHLl7hkZjgDFydpfTK+QWXeHxghVt3VoPqYL5/G+zYZPPIs+8GuqFXSTgxBSoB1RZtQ==
   dependencies:
-    postcss-selector-parser "^6.0.15"
+    postcss-selector-parser "^6.1.0"
 
 postcss-value-parser@^4.0.0, postcss-value-parser@^4.1.0, postcss-value-parser@^4.2.0:
   version "4.2.0"
@@ -14784,10 +14788,10 @@ progress@2.0.3:
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
 
-prom-client@^15.1.1:
-  version "15.1.1"
-  resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.1.tgz#71ba84371241acd173181b04a436782c246f3652"
-  integrity sha512-GVA2H96QCg2q71rjc3VYvSrVG7OpnJxyryC7dMzvfJfpJJHzQVwF3TJLfHzKORcwJpElWs1TwXLthlJAFJxq2A==
+prom-client@^15.1.2:
+  version "15.1.2"
+  resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.2.tgz#78d79f12c35d395ca97edf7111c18210cf07f815"
+  integrity sha512-on3h1iXb04QFLLThrmVYg1SChBQ9N1c+nKAjebBjokBqipddH3uxmOUcEkTnzmJ8Jh/5TSUnUqS40i2QB2dJHQ==
   dependencies:
     "@opentelemetry/api" "^1.4.0"
     tdigest "^0.1.1"
@@ -15058,10 +15062,10 @@ react-confetti@^6.1.0:
   dependencies:
     tween-functions "^1.2.0"
 
-react-datepicker@6.6.0:
-  version "6.6.0"
-  resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-6.6.0.tgz#0128547211c8fece08fef0b5406efffff2d36f1f"
-  integrity sha512-ERC0/Q4pPC9bNIcGUpdCbHc+oCxhkU3WI3UOGHkyJ3A9fqALCYpEmLc5S5xvAd7DuCDdbsyW97oRPM6pWWwjww==
+react-datepicker@6.9.0:
+  version "6.9.0"
+  resolved "https://registry.yarnpkg.com/react-datepicker/-/react-datepicker-6.9.0.tgz#0ad234dad81d567ae64cad79697bbad69c95490b"
+  integrity sha512-QTxuzeem7BUfVFWv+g5WuvzT0c5BPo+XTCNbMTZKSZQLU+cMMwSUHwspaxuIcDlwNcOH0tiJ+bh1fJ2yxOGYWA==
   dependencies:
     "@floating-ui/react" "^0.26.2"
     clsx "^2.1.0"
@@ -15290,20 +15294,20 @@ react-render-if-visible@^2.1.1:
   resolved "https://registry.yarnpkg.com/react-render-if-visible/-/react-render-if-visible-2.1.1.tgz#b67d8a6d230d8e1e8986212a1d4098425a26810b"
   integrity sha512-dl6OZkF+ktKi/pMNt5Upn99gSWnOCAQdFp/WBclMsPs4dV/RLeE40lab8tixoHB4UEKsspv0jFR13HF4fxmPHw==
 
-react-router-dom@6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.23.0.tgz#8b80ad92ad28f4dc38972e92d84b4c208150545a"
-  integrity sha512-Q9YaSYvubwgbal2c9DJKfx6hTNoBp3iJDsl+Duva/DwxoJH+OTXkxGpql4iUK2sla/8z4RpjAm6EWx1qUDuopQ==
+react-router-dom@6.23.1:
+  version "6.23.1"
+  resolved "https://registry.yarnpkg.com/react-router-dom/-/react-router-dom-6.23.1.tgz#30cbf266669693e9492aa4fc0dde2541ab02322f"
+  integrity sha512-utP+K+aSTtEdbWpC+4gxhdlPFwuEfDKq8ZrPFU65bbRJY+l706qjR7yaidBpo3MSeA/fzwbXWbKBI6ftOnP3OQ==
   dependencies:
-    "@remix-run/router" "1.16.0"
-    react-router "6.23.0"
+    "@remix-run/router" "1.16.1"
+    react-router "6.23.1"
 
-react-router@6.23.0:
-  version "6.23.0"
-  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.23.0.tgz#2f2d7492c66a6bdf760be4c6bdf9e1d672fa154b"
-  integrity sha512-wPMZ8S2TuPadH0sF5irFGjkNLIcRvOSaEe7v+JER8508dyJumm6XZB1u5kztlX0RVq6AzRVndzqcUh6sFIauzA==
+react-router@6.23.1:
+  version "6.23.1"
+  resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.23.1.tgz#d08cbdbd9d6aedc13eea6e94bc6d9b29cb1c4be9"
+  integrity sha512-fzcOaRF69uvqbbM7OhvQyBTFDVrrGlsFdS3AL+1KfIBtGETibHzi3FkoTRyiDJnWNc2VxrfvR+657ROHjaNjqQ==
   dependencies:
-    "@remix-run/router" "1.16.0"
+    "@remix-run/router" "1.16.1"
 
 react-shallow-renderer@^16.15.0:
   version "16.15.0"
@@ -15971,10 +15975,10 @@ sanitize-filename@^1.6.1, sanitize-filename@^1.6.3:
   dependencies:
     truncate-utf8-bytes "^1.0.0"
 
-sass-loader@14.2.0:
-  version "14.2.0"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.2.0.tgz#0d4440170fd9c9d93684e274a5ef73dbf55f414b"
-  integrity sha512-jxmjDXD9OYNDb2bp9JvopdE6QjecQY9beTWik/6sEHrsMxyo90Gyc471A4NUz60NLs4WsAh6yVtIvhLwEZcXeg==
+sass-loader@14.2.1:
+  version "14.2.1"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-14.2.1.tgz#db9ad96b56dc1c1ea546101e76375d5b008fec70"
+  integrity sha512-G0VcnMYU18a4N7VoNDegg2OuMjYtxnqzQWARVWCIVSZwJeiL9kg8QMsuIZOplsJgTzZLF6jGxI3AClj8I9nRdQ==
   dependencies:
     neo-async "^2.6.2"
 
@@ -16575,7 +16579,16 @@ string-length@^4.0.1:
     char-regex "^1.0.2"
     strip-ansi "^6.0.0"
 
-"string-width-cjs@npm:string-width@^4.2.0", "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
+"string-width-cjs@npm:string-width@^4.2.0":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
+  dependencies:
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
+
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
   integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -16662,7 +16675,14 @@ string_decoder@~1.1.1:
   dependencies:
     safe-buffer "~5.1.0"
 
-"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@^6.0.0, strip-ansi@^6.0.1:
+"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
+  dependencies:
+    ansi-regex "^5.0.1"
+
+strip-ansi@^6.0.0, strip-ansi@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
   integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -16726,13 +16746,13 @@ style-loader@^3.3.1:
   resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.3.4.tgz#f30f786c36db03a45cbd55b6a70d930c479090e7"
   integrity sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==
 
-stylehacks@^6.0.2:
-  version "6.0.2"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-6.0.2.tgz#5bf2654561752547d4548765f35c9a49659b3742"
-  integrity sha512-00zvJGnCu64EpMjX8b5iCZ3us2Ptyw8+toEkb92VdmkEaRaSGBNKAoK6aWZckhXxmQP8zWiTaFaiMGIU8Ve8sg==
+stylehacks@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-7.0.1.tgz#0e071acfbfdbc5ff422c27f1894a60a8bfe58885"
+  integrity sha512-PnrT4HzajnxbjfChpeBKLSpSykilnGBlD+pIffCoT5KbLur9fcL8uKRQJJap85byR2wCYZl/4Otk5eq76qeZxQ==
   dependencies:
-    browserslist "^4.22.2"
-    postcss-selector-parser "^6.0.15"
+    browserslist "^4.23.0"
+    postcss-selector-parser "^6.1.0"
 
 sucrase@^3.32.0:
   version "3.32.0"
@@ -16811,10 +16831,10 @@ svg-inline-loader@^0.8.2:
     object-assign "^4.0.1"
     simple-html-tokenizer "^0.1.1"
 
-svgo@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.2.0.tgz#7a5dff2938d8c6096e00295c2390e8e652fa805d"
-  integrity sha512-4PP6CMW/V7l/GmKRKzsLR8xxjdHTV4IMvhTnpuHwwBazSIlw5W/5SmPjN8Dwyt7lKbSJrRDgp4t9ph0HgChFBQ==
+svgo@^3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-3.3.2.tgz#ad58002652dffbb5986fc9716afe52d869ecbda8"
+  integrity sha512-OoohrmuUlBs8B8o6MB2Aevn+pRIH9zDALSR+6hhqVfa6fRwG/Qw9VUMSMW9VNg2CFc/MTIfabtdOVl9ODIJjpw==
   dependencies:
     "@trysound/sax" "0.2.0"
     commander "^7.2.0"
@@ -18121,7 +18141,7 @@ world-countries@5.0.0:
   resolved "https://registry.yarnpkg.com/world-countries/-/world-countries-5.0.0.tgz#6f75ebcce3d5224d84e9117eaf0d75a7726b6501"
   integrity sha512-wAfOT9Y5i/xnxNOdKJKXdOCw9Q3yQLahBUeuRol+s+o20F6h2a4tLEbJ1lBCYwEQ30Sf9Meqeipk1gib3YwF5w==
 
-"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
+"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
   integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -18139,6 +18159,15 @@ wrap-ansi@^6.2.0:
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
 
+wrap-ansi@^7.0.0:
+  version "7.0.0"
+  resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
+  integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
+  dependencies:
+    ansi-styles "^4.0.0"
+    string-width "^4.1.0"
+    strip-ansi "^6.0.0"
+
 wrap-ansi@^8.1.0:
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"