diff --git a/backend/app_tests/api/test_utils.py b/backend/app_tests/api/test_utils.py
index 448c5073b..a973ebb6c 100644
--- a/backend/app_tests/api/test_utils.py
+++ b/backend/app_tests/api/test_utils.py
@@ -100,7 +100,7 @@ def expected_request_response(
                 # User has access to the domain
                 return False, expected_status, "ok"
             else:
-                return False, expected_status, "outside_scope"
+                return True, expected_status, "outside_scope"
         else:
             # User has not permission to perform the action
             if (
@@ -771,7 +771,7 @@ def update_object(
                         ), f"{verbose_name} object detail can not be accessed with permission"
             else:
                 assert (
-                    response.status_code == status.HTTP_403_FORBIDDEN
+                    response.status_code == status.HTTP_404_NOT_FOUND
                 ), f"{verbose_name} object detail can be accessed without permission"
 
             if not (fails or user_perm_fails):
@@ -911,7 +911,7 @@ def delete_object(
                         ), f"{verbose_name} object detail can not be accessed with permission"
             else:
                 assert (
-                    response.status_code == status.HTTP_403_FORBIDDEN
+                    response.status_code == status.HTTP_404_NOT_FOUND
                 ), f"{verbose_name} object detail can be accessed without permission"
 
             # Asserts that the object was deleted successfully
diff --git a/backend/core/helpers.py b/backend/core/helpers.py
index 6745f371b..4b4afd492 100644
--- a/backend/core/helpers.py
+++ b/backend/core/helpers.py
@@ -1,25 +1,22 @@
+import json
 from collections.abc import MutableMapping
 from datetime import date, timedelta
+from typing import Optional
 
+from django.core.exceptions import NON_FIELD_ERRORS as DJ_NON_FIELD_ERRORS
+from django.core.exceptions import ValidationError as DjValidationError
 from django.db.models import Count
 from django.shortcuts import get_object_or_404
-from iam.models import Folder, Permission, RoleAssignment, User
+from rest_framework.exceptions import ValidationError as DRFValidationError
+from rest_framework.views import api_settings
+from rest_framework.views import exception_handler as drf_exception_handler
 
+from iam.models import Folder, Permission, RoleAssignment, User
 from library.helpers import get_referential_translation
 
 from .models import *
 from .utils import camel_case
 
-from typing import List, Dict, Optional
-
-import json
-
-from django.core.exceptions import NON_FIELD_ERRORS as DJ_NON_FIELD_ERRORS
-from django.core.exceptions import ValidationError as DjValidationError
-from rest_framework.exceptions import ValidationError as DRFValidationError
-from rest_framework.views import api_settings
-from rest_framework.views import exception_handler as drf_exception_handler
-
 DRF_NON_FIELD_ERRORS = api_settings.NON_FIELD_ERRORS_KEY
 
 
@@ -1142,6 +1139,30 @@ def threats_count_per_name(user: User):
     return {"labels": labels, "values": values}
 
 
+def get_folder_content(folder: Folder):
+    content = []
+    for f in Folder.objects.filter(parent_folder=folder).distinct():
+        content.append({"name": f.name, "children": get_folder_content(f)})
+    for p in Project.objects.filter(folder=folder).distinct():
+        content.append(
+            {
+                "name": p.name,
+                "children": [
+                    {
+                        "name": "audits",
+                        "value": ComplianceAssessment.objects.filter(project=p).count(),
+                    },
+                    {
+                        "name": "risk assessments",
+                        "value": RiskAssessment.objects.filter(project=p).count(),
+                    },
+                ],
+            }
+        )
+
+    return content
+
+
 def handle(exc, context):
     # translate django validation error which ...
     # .. causes HTTP 500 status ==> DRF validation which will cause 400 HTTP status
diff --git a/backend/core/startup.py b/backend/core/startup.py
index ec5079096..e87468a4c 100644
--- a/backend/core/startup.py
+++ b/backend/core/startup.py
@@ -11,28 +11,32 @@
 logger = get_logger(__name__)
 
 READER_PERMISSIONS_LIST = [
-    "view_project",
-    "view_riskassessment",
     "view_appliedcontrol",
-    "view_policy",
-    "view_riskscenario",
-    "view_riskacceptance",
     "view_asset",
-    "view_threat",
-    "view_referencecontrol",
-    "view_folder",
-    "view_usergroup",
-    "view_riskmatrix",
     "view_complianceassessment",
-    "view_requirementassessment",
-    "view_requirementnode",
+    "view_entity",
+    "view_entityassessment",
     "view_evidence",
+    "view_folder",
     "view_framework",
     "view_loadedlibrary",
+    "view_policy",
+    "view_project",
+    "view_referencecontrol",
+    "view_representative",
+    "view_requirementassessment",
+    "view_requirementmapping",
+    "view_requirementmappingset",
+    "view_requirementnode",
+    "view_riskacceptance",
+    "view_riskassessment",
+    "view_riskmatrix",
+    "view_riskscenario",
+    "view_solution",
     "view_storedlibrary",
+    "view_threat",
     "view_user",
-    "view_requirementmappingset",
-    "view_requirementmapping",
+    "view_usergroup",
 ]
 
 APPROVER_PERMISSIONS_LIST = [
@@ -62,120 +66,153 @@
 ]
 
 ANALYST_PERMISSIONS_LIST = [
+    "add_appliedcontrol",
+    "add_asset",
+    "add_complianceassessment",
+    "add_evidence",
+    "add_policy",
     "add_project",
-    "view_project",
-    "change_project",
-    "delete_project",
+    "add_riskacceptance",
     "add_riskassessment",
-    "view_riskassessment",
-    "change_riskassessment",
-    "delete_riskassessment",
-    "add_appliedcontrol",
-    "view_appliedcontrol",
+    "add_riskscenario",
+    "add_solution",
+    "add_threat",
     "change_appliedcontrol",
-    "delete_appliedcontrol",
-    "add_policy",
-    "view_policy",
+    "change_asset",
+    "change_complianceassessment",
+    "change_entity",
+    "change_entityassessment",
+    "change_evidence",
     "change_policy",
-    "delete_policy",
-    "add_riskscenario",
-    "view_riskscenario",
-    "change_riskscenario",
-    "delete_riskscenario",
-    "add_riskacceptance",
-    "view_riskacceptance",
+    "change_project",
+    "change_referencecontrol",
+    "change_representative",
+    "change_requirementassessment",
     "change_riskacceptance",
-    "delete_riskacceptance",
-    "add_complianceassessment",
-    "view_complianceassessment",
-    "change_complianceassessment",
+    "change_riskassessment",
+    "change_riskscenario",
+    "change_solution",
+    "change_threat",
+    "delete_appliedcontrol",
+    "delete_asset",
     "delete_complianceassessment",
-    "view_requirementassessment",
-    "change_requirementassessment",
-    "add_evidence",
-    "view_evidence",
-    "change_evidence",
+    "delete_entity",
+    "delete_entityassessment",
     "delete_evidence",
-    "add_asset",
-    "view_asset",
-    "change_asset",
-    "delete_asset",
-    "add_threat",
-    "view_threat",
-    "change_threat",
+    "delete_policy",
+    "delete_project",
+    "delete_referencecontrol",
+    "delete_representative",
+    "delete_riskacceptance",
+    "delete_riskassessment",
+    "delete_riskscenario",
+    "delete_solution",
     "delete_threat",
-    "view_referencecontrol",
+    "view_appliedcontrol",
+    "view_asset",
+    "view_complianceassessment",
+    "view_entity",
+    "view_entityassessment",
+    "view_evidence",
     "view_folder",
-    "view_usergroup",
-    "view_riskmatrix",
-    "view_requirementnode",
     "view_framework",
-    "view_storedlibrary",
     "view_loadedlibrary",
-    "view_user",
-    "view_requirementmappingset",
+    "view_policy",
+    "view_project",
+    "view_referencecontrol",
+    "view_representative",
+    "view_requirementassessment",
     "view_requirementmapping",
+    "view_requirementmappingset",
+    "view_requirementnode",
+    "view_riskacceptance",
+    "view_riskassessment",
+    "view_riskmatrix",
+    "view_riskscenario",
+    "view_solution",
+    "view_storedlibrary",
+    "view_threat",
+    "view_user",
+    "view_usergroup",
 ]
 
 DOMAIN_MANAGER_PERMISSIONS_LIST = [
-    "change_usergroup",
-    "view_usergroup",
-    "add_project",
-    "change_project",
-    "delete_project",
-    "view_project",
-    "add_riskassessment",
-    "view_riskassessment",
-    "change_riskassessment",
-    "delete_riskassessment",
     "add_appliedcontrol",
-    "view_appliedcontrol",
-    "change_appliedcontrol",
-    "delete_appliedcontrol",
+    "add_asset",
+    "add_complianceassessment",
+    "add_entity",
+    "add_entityassessment",
+    "add_evidence",
+    "add_folder",
     "add_policy",
-    "view_policy",
-    "change_policy",
-    "delete_policy",
-    "add_riskscenario",
-    "view_riskscenario",
-    "change_riskscenario",
-    "delete_riskscenario",
+    "add_project",
     "add_riskacceptance",
-    "view_riskacceptance",
-    "change_riskacceptance",
-    "delete_riskacceptance",
-    "add_asset",
-    "view_asset",
-    "change_asset",
-    "delete_asset",
+    "add_riskassessment",
+    "add_riskmatrix",
+    "add_riskscenario",
+    "add_solution",
     "add_threat",
-    "view_threat",
-    "change_threat",
-    "delete_threat",
-    "view_referencecontrol",
-    "view_folder",
+    "change_appliedcontrol",
+    "change_asset",
+    "change_complianceassessment",
+    "change_entity",
+    "change_entityassessment",
+    "change_evidence",
     "change_folder",
-    "add_riskmatrix",
-    "view_riskmatrix",
+    "change_policy",
+    "change_project",
+    "change_referencecontrol",
+    "change_representative",
+    "change_requirementassessment",
+    "change_riskacceptance",
+    "change_riskassessment",
     "change_riskmatrix",
+    "change_riskscenario",
+    "change_solution",
+    "change_threat",
+    "delete_appliedcontrol",
+    "delete_asset",
+    "delete_complianceassessment",
+    "delete_entity",
+    "delete_entityassessment",
+    "delete_evidence",
+    "delete_folder",
+    "delete_policy",
+    "delete_project",
+    "delete_referencecontrol",
+    "delete_representative",
+    "delete_riskacceptance",
+    "delete_riskassessment",
     "delete_riskmatrix",
-    "add_complianceassessment",
+    "delete_riskscenario",
+    "delete_solution",
+    "delete_threat",
+    "view_appliedcontrol",
+    "view_asset",
     "view_complianceassessment",
-    "change_complianceassessment",
-    "delete_complianceassessment",
-    "view_requirementassessment",
-    "change_requirementassessment",
-    "add_evidence",
+    "view_entity",
+    "view_entityassessment",
     "view_evidence",
-    "change_evidence",
-    "delete_evidence",
-    "view_requirementnode",
+    "view_folder",
     "view_framework",
-    "view_storedlibrary",
     "view_loadedlibrary",
-    "view_user",
-    "view_requirementmappingset",
+    "view_policy",
+    "view_project",
+    "view_referencecontrol",
+    "view_representative",
+    "view_requirementassessment",
     "view_requirementmapping",
+    "view_requirementmappingset",
+    "view_requirementnode",
+    "view_riskacceptance",
+    "view_riskassessment",
+    "view_riskmatrix",
+    "view_riskscenario",
+    "view_solution",
+    "view_storedlibrary",
+    "view_threat",
+    "view_user",
+    "view_usergroup",
 ]
 
 ADMINISTRATOR_PERMISSIONS_LIST = [
diff --git a/backend/core/views.py b/backend/core/views.py
index 892264fee..b5f901bee 100644
--- a/backend/core/views.py
+++ b/backend/core/views.py
@@ -1156,32 +1156,12 @@ def org_tree(self, request):
             object_type=Folder,
         )
         folders_list = list()
-        for folder in Folder.objects.exclude(content_type="GL").filter(
-            id__in=viewable_objects
+        for folder in (
+            Folder.objects.exclude(content_type="GL")
+            .filter(id__in=viewable_objects, parent_folder=Folder.get_root_folder())
+            .distinct()
         ):
-            entry = {"name": folder.name}
-            children = []
-            for project in Project.objects.filter(folder=folder):
-                children.append(
-                    {
-                        "name": project.name,
-                        "children": [
-                            {
-                                "name": "audits",
-                                "value": ComplianceAssessment.objects.filter(
-                                    project=project
-                                ).count(),
-                            },
-                            {
-                                "name": "risk assessments",
-                                "value": RiskAssessment.objects.filter(
-                                    project=project
-                                ).count(),
-                            },
-                        ],
-                    }
-                )
-            entry.update({"children": children})
+            entry = {"name": folder.name, "children": get_folder_content(folder)}
             folders_list.append(entry)
         tree.update({"children": folders_list})
 
diff --git a/backend/library/management/commands/storelibraries.py b/backend/library/management/commands/storelibraries.py
index 4ac126240..617c74877 100644
--- a/backend/library/management/commands/storelibraries.py
+++ b/backend/library/management/commands/storelibraries.py
@@ -1,12 +1,14 @@
 from pathlib import Path
 
-import structlog
+import structlog, signal
 from ciso_assistant.settings import LIBRARIES_PATH
 from core.models import StoredLibrary
 from django.core.management.base import BaseCommand
 
 logger = structlog.getLogger(__name__)
 
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+
 
 class Command(BaseCommand):
     help = "Store libraries in the database"
diff --git a/enterprise/frontend/src/lib/components/Forms/ModelForm.svelte b/enterprise/frontend/src/lib/components/Forms/ModelForm.svelte
deleted file mode 100644
index 1ca3994eb..000000000
--- a/enterprise/frontend/src/lib/components/Forms/ModelForm.svelte
+++ /dev/null
@@ -1,1418 +0,0 @@
-<script lang="ts">
-	import { onDestroy } from 'svelte';
-
-	import Checkbox from '$lib/components/Forms/Checkbox.svelte';
-	import SuperForm from '$lib/components/Forms/Form.svelte';
-	import TextArea from '$lib/components/Forms/TextArea.svelte';
-	import TextField from '$lib/components/Forms/TextField.svelte';
-	import NumberField from '$lib/components/Forms/NumberField.svelte';
-
-	import AutocompleteSelect from './AutocompleteSelect.svelte';
-	import Select from './Select.svelte';
-
-	import { getOptions } from '$lib/utils/crud';
-	import { modelSchema } from '$lib/utils/schemas';
-	import type { ModelInfo, urlModel, CacheLock } from '$lib/utils/types';
-	import type { SuperValidated } from 'sveltekit-superforms';
-	import type { AnyZodObject } from 'zod';
-	import HiddenInput from './HiddenInput.svelte';
-	import FileInput from './FileInput.svelte';
-	import { browser } from '$app/environment';
-	import { page } from '$app/stores';
-	import * as m from '$paraglide/messages.js';
-	import { zod } from 'sveltekit-superforms/adapters';
-	import { getSecureRedirect } from '$lib/utils/helpers';
-	import { Accordion, AccordionItem } from '@skeletonlabs/skeleton';
-	import { createModalCache } from '$lib/utils/stores';
-	import Score from './Score.svelte';
-	export let form: SuperValidated<AnyZodObject>;
-	export let invalidateAll = true; // set to false to keep form data using muliple forms on a page
-	export let model: ModelInfo;
-	export let context = 'default';
-	export let caching: boolean = false;
-	export let closeModal = false;
-	export let parent: any;
-	export let suggestions: { [key: string]: any } = {};
-	export let cancelButton = true;
-	export let riskAssessmentDuplication = false;
-
-	const URLModel = model.urlModel as urlModel;
-	export let schema = modelSchema(URLModel);
-	export let object: Record<string, any> = {};
-
-	function cancel(): void {
-		if (browser) {
-			var currentUrl = window.location.href;
-			var url = new URL(currentUrl);
-			var nextValue = getSecureRedirect(url.searchParams.get('next'));
-			if (nextValue) window.location.href = nextValue;
-		}
-	}
-	$: shape = schema.shape || schema._def.schema.shape;
-	let updated_fields = new Set();
-
-	function makeCacheLock(): CacheLock {
-		let resolve: (_: any) => any = (_) => _;
-		const promise = new Promise((res) => {
-			resolve = res;
-		});
-		return { resolve, promise };
-	}
-
-	let cacheLocks = {};
-	$: if (shape)
-		cacheLocks = Object.keys(shape).reduce((acc, field) => {
-			acc[field] = makeCacheLock();
-			return acc;
-		}, {});
-
-	let formDataCache = {};
-	let urlModelFromPage;
-
-	$: if ($page) {
-		urlModelFromPage = `${$page.url}`.replace(/^.*:\/\/[^/]+/, '');
-		createModalCache.setModelName(urlModelFromPage);
-		if (caching) {
-			createModalCache.data[model.urlModel] ??= {};
-			formDataCache = createModalCache.data[model.urlModel];
-		}
-	}
-
-	$: if (caching) {
-		for (const key of Object.keys(cacheLocks)) {
-			cacheLocks[key].resolve(formDataCache[key]);
-		}
-	}
-
-	onDestroy(() => {
-		createModalCache.garbageCollect();
-	});
-</script>
-
-<SuperForm
-	class="flex flex-col space-y-3"
-	dataType={shape.attachment ? 'form' : 'json'}
-	enctype={shape.attachment ? 'multipart/form-data' : 'application/x-www-form-urlencoded'}
-	data={form}
-	{invalidateAll}
-	let:form
-	let:data
-	let:initialData
-	validators={zod(schema)}
-	onUpdated={() => createModalCache.deleteCache(model.urlModel)}
-	{...$$restProps}
->
-	<input type="hidden" name="urlmodel" value={model.urlModel} />
-	<!--NOTE: Not the cleanest pattern, will refactor-->
-	<!--TODO: Refactor-->
-	{#if shape.reference_control}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['reference_control'],
-				extra_fields: [['folder', 'str']],
-				suggestions: suggestions['reference_control'],
-				label: 'auto' // convention for automatic label calculation
-			})}
-			field="reference_control"
-			cacheLock={cacheLocks['reference_control']}
-			bind:cachedValue={formDataCache['reference_control']}
-			label={m.referenceControl()}
-			nullable={true}
-			on:change={async (e) => {
-				if (e.detail) {
-					await fetch(`/reference-controls/${e.detail}`)
-						.then((r) => r.json())
-						.then((r) => {
-							form.form.update((currentData) => {
-								if (
-									context === 'edit' &&
-									currentData['reference_control'] === initialData['reference_control'] &&
-									!updated_fields.has('reference_control')
-								) {
-									return currentData; // Keep the current values in the edit form.
-								}
-								updated_fields.add('reference_control');
-								return { ...currentData, category: r.category, csf_function: r.csf_function };
-							});
-						});
-				}
-			}}
-		/>
-	{/if}
-	{#if shape.name}
-		<TextField
-			{form}
-			field="name"
-			label={m.name()}
-			cacheLock={cacheLocks['name']}
-			bind:cachedValue={formDataCache['name']}
-			data-focusindex="0"
-		/>
-	{/if}
-	{#if shape.description}
-		<TextArea
-			{form}
-			field="description"
-			label={m.description()}
-			cacheLock={cacheLocks['description']}
-			bind:cachedValue={formDataCache['description']}
-			data-focusindex="1"
-		/>
-	{/if}
-	{#if URLModel === 'projects'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<TextField
-			{form}
-			field="internal_reference"
-			label={m.internalReference()}
-			cacheLock={cacheLocks['internal_reference']}
-			bind:cachedValue={formDataCache['internal_reference']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['lc_status']}
-			field="lc_status"
-			label={m.lcStatus()}
-			cacheLock={cacheLocks['lc_status']}
-			bind:cachedValue={formDataCache['lc_status']}
-		/>
-	{:else if URLModel === 'folders'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['parent_folder'] })}
-			field="parent_folder"
-			cacheLock={cacheLocks['parent_folder']}
-			bind:cachedValue={formDataCache['parent_folder']}
-			label={m.parentDomain()}
-			hide={initialData.parent_folder}
-		/>
-	{:else if URLModel === 'risk-assessments' || URLModel === 'risk-assessment-duplicate'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['project'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="project"
-			cacheLock={cacheLocks['project']}
-			bind:cachedValue={formDataCache['project']}
-			label={m.project()}
-			hidden={initialData.project}
-		/>
-		<TextField
-			{form}
-			field="version"
-			label={m.version()}
-			cacheLock={cacheLocks['version']}
-			bind:cachedValue={formDataCache['version']}
-		/>
-		{#if !riskAssessmentDuplication}
-			<Select
-				{form}
-				options={model.selectOptions['status']}
-				field="status"
-				hide
-				label={m.status()}
-				cacheLock={cacheLocks['status']}
-				bind:cachedValue={formDataCache['status']}
-			/>
-			<AutocompleteSelect
-				{form}
-				disabled={object.id}
-				options={getOptions({ objects: model.foreignKeys['risk_matrix'] })}
-				field="risk_matrix"
-				cacheLock={cacheLocks['risk_matrix']}
-				bind:cachedValue={formDataCache['risk_matrix']}
-				label={m.riskMatrix()}
-				helpText={m.riskAssessmentMatrixHelpText()}
-			/>
-			<AutocompleteSelect
-				{form}
-				multiple
-				options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-				field="authors"
-				cacheLock={cacheLocks['authors']}
-				bind:cachedValue={formDataCache['authors']}
-				label={m.authors()}
-			/>
-			<AutocompleteSelect
-				{form}
-				multiple
-				options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-				field="reviewers"
-				cacheLock={cacheLocks['reviewers']}
-				bind:cachedValue={formDataCache['reviewers']}
-				label={m.reviewers()}
-			/>
-			<TextField
-				type="date"
-				{form}
-				field="eta"
-				label={m.eta()}
-				helpText={m.etaHelpText()}
-				cacheLock={cacheLocks['eta']}
-				bind:cachedValue={formDataCache['eta']}
-			/>
-			<TextField
-				type="date"
-				{form}
-				field="due_date"
-				label={m.dueDate()}
-				helpText={m.dueDateHelpText()}
-				cacheLock={cacheLocks['due_date']}
-				bind:cachedValue={formDataCache['due_date']}
-			/>
-			<TextArea
-				{form}
-				field="observation"
-				label={m.observation()}
-				cacheLock={cacheLocks['observation']}
-				bind:cachedValue={formDataCache['observation']}
-			/>
-		{/if}
-	{:else if URLModel === 'threats'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<TextArea
-			{form}
-			field="annotation"
-			label={m.annotation()}
-			cacheLock={cacheLocks['annotation']}
-			bind:cachedValue={formDataCache['annotation']}
-		/>
-		<TextField
-			{form}
-			field="provider"
-			label={m.provider()}
-			cacheLock={cacheLocks['provider']}
-			bind:cachedValue={formDataCache['provider']}
-		/>
-	{:else if URLModel === 'risk-scenarios'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['risk_assessment'],
-				label: 'str',
-				extra_fields: [['project', 'str']]
-			})}
-			field="risk_assessment"
-			cacheLock={cacheLocks['risk_assessment']}
-			bind:cachedValue={formDataCache['risk_assessment']}
-			label={m.riskAssessment()}
-			hidden={initialData.risk_assessment}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({
-				objects: model.foreignKeys['threats'],
-				extra_fields: [['folder', 'str']],
-				label: 'auto' // convention for automatic label calculation
-			})}
-			field="threats"
-			cacheLock={cacheLocks['threats']}
-			bind:cachedValue={formDataCache['threats']}
-			label={m.threats()}
-		/>
-	{:else if URLModel === 'applied-controls' || URLModel === 'policies'}
-		{#if schema.shape.category}
-			<Select
-				{form}
-				options={model.selectOptions['category']}
-				field="category"
-				label={m.category()}
-				cacheLock={cacheLocks['category']}
-				bind:cachedValue={formDataCache['category']}
-			/>
-		{/if}
-		<Select
-			{form}
-			options={model.selectOptions['csf_function']}
-			field="csf_function"
-			label={m.csfFunction()}
-			cacheLock={cacheLocks['csf_function']}
-			bind:cachedValue={formDataCache['csf_function']}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['owner'], label: 'email' })}
-			field="owner"
-			cacheLock={cacheLocks['owner']}
-			bind:cachedValue={formDataCache['owner']}
-			label={m.owner()}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({
-				objects: model.foreignKeys['evidences'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="evidences"
-			cacheLock={cacheLocks['evidences']}
-			bind:cachedValue={formDataCache['evidences']}
-			label={m.evidences()}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="eta"
-			label={m.eta()}
-			helpText={m.etaHelpText()}
-			cacheLock={cacheLocks['eta']}
-			bind:cachedValue={formDataCache['eta']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="expiry_date"
-			label={m.expiryDate()}
-			helpText={m.expiryDateHelpText()}
-			cacheLock={cacheLocks['expiry_date']}
-			bind:cachedValue={formDataCache['expiry_date']}
-		/>
-		<TextField
-			{form}
-			field="link"
-			label={m.link()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['link']}
-			bind:cachedValue={formDataCache['link']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['effort']}
-			field="effort"
-			label={m.effort()}
-			helpText={m.effortHelpText()}
-			cacheLock={cacheLocks['effort']}
-			bind:cachedValue={formDataCache['effort']}
-		/>
-		<NumberField
-			{form}
-			field="cost"
-			label={m.cost()}
-			helpText={m.costHelpText()}
-			cacheLock={cacheLocks['cost']}
-			bind:cachedValue={formDataCache['cost']}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-	{:else if URLModel === 'risk-acceptances'}
-		<TextField
-			{form}
-			type="date"
-			field="expiry_date"
-			label={m.expiryDate()}
-			helpText={m.expiryDateHelpText()}
-			cacheLock={cacheLocks['expiry_date']}
-			bind:cachedValue={formDataCache['expiry_date']}
-		/>
-		{#if object.id && $page.data.user.id === object.approver}
-			<TextArea
-				disabled={$page.data.user.id !== object.approver}
-				{form}
-				field="justification"
-				label={m.justification()}
-				helpText={m.riskAcceptanceJusitficationHelpText()}
-				cacheLock={cacheLocks['justification']}
-				bind:cachedValue={formDataCache['justification']}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['approver'], label: 'email' })}
-			field="approver"
-			cacheLock={cacheLocks['approver']}
-			bind:cachedValue={formDataCache['approver']}
-			label={m.approver()}
-			helpText={m.approverHelpText()}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['risk_scenarios'],
-				extra_fields: [
-					['project', 'str'],
-					['risk_assessment', 'str']
-				]
-			})}
-			field="risk_scenarios"
-			cacheLock={cacheLocks['risk_scenarios']}
-			bind:cachedValue={formDataCache['risk_scenarios']}
-			label={m.riskScenarios()}
-			helpText={m.riskAcceptanceRiskScenariosHelpText()}
-			multiple
-		/>
-	{:else if URLModel === 'reference-controls'}
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['category']}
-			field="category"
-			label={m.category()}
-			cacheLock={cacheLocks['category']}
-			bind:cachedValue={formDataCache['category']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['csf_function']}
-			field="csf_function"
-			label={m.csfFunction()}
-			cacheLock={cacheLocks['csf_function']}
-			bind:cachedValue={formDataCache['csf_function']}
-		/>
-		<TextArea
-			{form}
-			field="annotation"
-			label={m.annotation()}
-			cacheLock={cacheLocks['annotation']}
-			bind:cachedValue={formDataCache['annotation']}
-		/>
-		<TextField
-			{form}
-			field="provider"
-			label={m.provider()}
-			cacheLock={cacheLocks['provider']}
-			bind:cachedValue={formDataCache['provider']}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-	{:else if URLModel === 'evidences'}
-		<HiddenInput {form} field="applied_controls" />
-		<HiddenInput {form} field="requirement_assessments" />
-		<FileInput
-			{form}
-			allowPaste={true}
-			helpText={object.attachment
-				? `${m.attachmentWarningText()}: ${object.attachment}`
-				: m.attachmentHelpText()}
-			field="attachment"
-			label={m.attachment()}
-		/>
-		{#if !(initialData.applied_controls || initialData.requirement_assessments)}
-			<AutocompleteSelect
-				{form}
-				options={getOptions({ objects: model.foreignKeys['folder'] })}
-				field="folder"
-				cacheLock={cacheLocks['folder']}
-				bind:cachedValue={formDataCache['folder']}
-				label={m.domain()}
-				hidden={initialData.applied_controls || initialData.requirement_assessments}
-			/>
-		{:else}
-			<HiddenInput {form} field="folder" />
-		{/if}
-		<TextField
-			{form}
-			field="link"
-			label={m.link()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['link']}
-			bind:cachedValue={formDataCache['link']}
-		/>
-	{:else if URLModel === 'compliance-assessments'}
-		{#if context === 'fromBaseline' && initialData.baseline}
-			<AutocompleteSelect
-				{form}
-				field="baseline"
-				cacheLock={cacheLocks['baseline']}
-				bind:cachedValue={formDataCache['baseline']}
-				label={m.baseline()}
-				options={getOptions({ objects: model.foreignKeys['baseline'] })}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['project'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="project"
-			cacheLock={cacheLocks['project']}
-			bind:cachedValue={formDataCache['project']}
-			label={m.project()}
-			hidden={initialData.project}
-		/>
-		<TextField
-			{form}
-			field="version"
-			label={m.version()}
-			cacheLock={cacheLocks['version']}
-			bind:cachedValue={formDataCache['version']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<AutocompleteSelect
-			{form}
-			disabled={object.id}
-			options={getOptions({ objects: model.foreignKeys['framework'] })}
-			field="framework"
-			cacheLock={cacheLocks['framework']}
-			bind:cachedValue={formDataCache['framework']}
-			label={m.framework()}
-			on:change={async (e) => {
-				if (e.detail) {
-					await fetch(`/frameworks/${e.detail}`)
-						.then((r) => r.json())
-						.then((r) => {
-							const implementation_groups = r['implementation_groups_definition'] || [];
-							model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
-								(group) => ({ label: group.name, value: group.ref_id })
-							);
-						});
-				}
-			}}
-		/>
-		{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
-			<AutocompleteSelect
-				multiple
-				translateOptions={false}
-				{form}
-				options={model.selectOptions['selected_implementation_groups']}
-				field="selected_implementation_groups"
-				cacheLock={cacheLocks['selected_implementation_groups']}
-				bind:cachedValue={formDataCache['selected_implementation_groups']}
-				label={m.selectedImplementationGroups()}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-			field="authors"
-			cacheLock={cacheLocks['authors']}
-			bind:cachedValue={formDataCache['authors']}
-			label={m.authors()}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-			field="reviewers"
-			cacheLock={cacheLocks['reviewers']}
-			bind:cachedValue={formDataCache['reviewers']}
-			label={m.reviewers()}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="eta"
-			label={m.eta()}
-			helpText={m.etaHelpText()}
-			cacheLock={cacheLocks['eta']}
-			bind:cachedValue={formDataCache['eta']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="due_date"
-			label={m.dueDate()}
-			helpText={m.dueDateHelpText()}
-			cacheLock={cacheLocks['due_date']}
-			bind:cachedValue={formDataCache['due_date']}
-		/>
-		<TextArea
-			{form}
-			field="observation"
-			label={m.observation()}
-			cacheLock={cacheLocks['observation']}
-			bind:cachedValue={formDataCache['observation']}
-		/>
-	{:else if URLModel === 'assets'}
-		<TextArea
-			{form}
-			field="business_value"
-			label={m.businessValue()}
-			cacheLock={cacheLocks['business_value']}
-			bind:cachedValue={formDataCache['business_value']}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['type']}
-			field="type"
-			label="Type"
-			cacheLock={cacheLocks['type']}
-			bind:cachedValue={formDataCache['type']}
-		/>
-		<AutocompleteSelect
-			disabled={data.type === 'PR'}
-			multiple
-			{form}
-			options={getOptions({ objects: model.foreignKeys['parent_assets'], self: object })}
-			field="parent_assets"
-			cacheLock={cacheLocks['parent_assets']}
-			bind:cachedValue={formDataCache['parent_assets']}
-			label={m.parentAssets()}
-		/>
-	{:else if URLModel === 'requirement-assessments'}
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['result']}
-			field="result"
-			label={m.result()}
-			cacheLock={cacheLocks['result']}
-			bind:cachedValue={formDataCache['result']}
-		/>
-		<TextArea
-			{form}
-			field="observation"
-			label={m.observation()}
-			cacheLock={cacheLocks['observation']}
-			bind:cachedValue={formDataCache['observation']}
-		/>
-		<HiddenInput {form} field="folder" />
-		<HiddenInput {form} field="requirement" />
-		<HiddenInput {form} field="compliance_assessment" />
-	{:else if URLModel === 'entities'}
-		<TextArea
-			{form}
-			field="mission"
-			label={m.mission()}
-			cacheLock={cacheLocks['mission']}
-			bind:cachedValue={formDataCache['mission']}
-		/>
-		<TextField
-			{form}
-			field="reference_link"
-			label={m.referenceLink()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['reference_link']}
-			bind:cachedValue={formDataCache['reference_link']}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['folder'] })}
-			field="folder"
-			cacheLock={cacheLocks['folder']}
-			bind:cachedValue={formDataCache['folder']}
-			label={m.domain()}
-			hidden={initialData.folder}
-		/>
-	{:else if URLModel === 'entity-assessments'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['project'] })}
-			field="project"
-			cacheLock={cacheLocks['project']}
-			bind:cachedValue={formDataCache['project']}
-			label={m.project()}
-			hidden={initialData.project}
-		/>
-		{#if !data.compliance_assessment}
-			<Checkbox
-				{form}
-				field="create_audit"
-				label={m.createAudit()}
-				helpText={m.createAuditHelpText()}
-			/>
-			<AutocompleteSelect
-				{form}
-				disabled={!data.create_audit}
-				mandatory
-				hidden={!data.create_audit}
-				options={getOptions({ objects: model.foreignKeys['framework'] })}
-				field="framework"
-				cacheLock={cacheLocks['framework']}
-				bind:cachedValue={formDataCache['framework']}
-				label={m.framework()}
-				on:change={async (e) => {
-					if (e.detail) {
-						await fetch(`/frameworks/${e.detail}`)
-							.then((r) => r.json())
-							.then((r) => {
-								const implementation_groups = r['implementation_groups_definition'] || [];
-								model.selectOptions['selected_implementation_groups'] = implementation_groups.map(
-									(group) => ({ label: group.name, value: group.ref_id })
-								);
-							});
-					}
-				}}
-			/>
-			{#if model.selectOptions['selected_implementation_groups'] && model.selectOptions['selected_implementation_groups'].length}
-				<AutocompleteSelect
-					multiple
-					translateOptions={false}
-					{form}
-					options={model.selectOptions['selected_implementation_groups']}
-					field="selected_implementation_groups"
-					cacheLock={cacheLocks['selected_implementation_groups']}
-					bind:cachedValue={formDataCache['selected_implementation_groups']}
-					label={m.selectedImplementationGroups()}
-				/>
-			{/if}
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['entity'] })}
-			field="entity"
-			cacheLock={cacheLocks['entity']}
-			bind:cachedValue={formDataCache['entity']}
-			label={m.entity()}
-			hidden={initialData.entity}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['solutions'] })}
-			field="solutions"
-			cacheLock={cacheLocks['solutions']}
-			bind:cachedValue={formDataCache['solutions']}
-			label={m.solutions()}
-		/>
-		<Score
-			{form}
-			label={m.criticality()}
-			field="criticality"
-			always_enabled={true}
-			inversedColors
-			fullDonut
-			min_score={1}
-			max_score={4}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['status']}
-			field="status"
-			label={m.status()}
-			cacheLock={cacheLocks['status']}
-			bind:cachedValue={formDataCache['status']}
-		/>
-		<TextField
-			{form}
-			field="version"
-			label={m.version()}
-			cacheLock={cacheLocks['version']}
-			bind:cachedValue={formDataCache['version']}
-		/>
-		<TextField
-			{form}
-			field="reference_link"
-			label={m.referenceLink()}
-			helpText={m.linkHelpText()}
-			cacheLock={cacheLocks['reference_link']}
-			bind:cachedValue={formDataCache['reference_link']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="eta"
-			label={m.eta()}
-			helpText={m.etaHelpText()}
-			cacheLock={cacheLocks['eta']}
-			bind:cachedValue={formDataCache['eta']}
-		/>
-		<TextField
-			type="date"
-			{form}
-			field="due_date"
-			label={m.dueDate()}
-			helpText={m.dueDateHelpText()}
-			cacheLock={cacheLocks['due_date']}
-			bind:cachedValue={formDataCache['due_date']}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['authors'], label: 'email' })}
-			field="authors"
-			cacheLock={cacheLocks['authors']}
-			bind:cachedValue={formDataCache['authors']}
-			label={m.authors()}
-		/>
-		<AutocompleteSelect
-			{form}
-			multiple
-			options={getOptions({ objects: model.foreignKeys['reviewers'], label: 'email' })}
-			field="reviewers"
-			cacheLock={cacheLocks['reviewers']}
-			bind:cachedValue={formDataCache['reviewers']}
-			label={m.reviewers()}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['compliance_assessment'] })}
-			field="compliance_assessment"
-			cacheLock={cacheLocks['compliance_assessment']}
-			bind:cachedValue={formDataCache['compliance_assessment']}
-			label={m.complianceAssessment()}
-			disabled={data.create_audit}
-			hidden={data.create_audit}
-		/>
-		<AutocompleteSelect
-			{form}
-			options={getOptions({
-				objects: model.foreignKeys['evidence'],
-				extra_fields: [['folder', 'str']]
-			})}
-			field="evidence"
-			cacheLock={cacheLocks['evidence']}
-			bind:cachedValue={formDataCache['evidence']}
-			label={m.evidence()}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['conclusion']}
-			field="conclusion"
-			label={m.conclusion()}
-			cacheLock={cacheLocks['conclusion']}
-			bind:cachedValue={formDataCache['conclusion']}
-		/>
-		<TextArea
-			{form}
-			field="observation"
-			label={m.observation()}
-			cacheLock={cacheLocks['observation']}
-			bind:cachedValue={formDataCache['observation']}
-		/>
-		<!-- <Score {form} label={m.penetration()} field="penetration" always_enabled={true} inversedColors fullDonut max_score={5} />
-		<Score {form} label={m.dependency()} field="dependency" always_enabled={true} inversedColors fullDonut max_score={5} />
-		<Score {form} label={m.maturity()} field="maturity" always_enabled={true} inversedColors fullDonut max_score={5} />
-		<Score {form} label={m.trust()} field="trust" always_enabled={true} inversedColors fullDonut max_score={5} /> -->
-	{:else if URLModel === 'solutions'}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['provider_entity'] })}
-			field="provider_entity"
-			cacheLock={cacheLocks['provider_entity']}
-			bind:cachedValue={formDataCache['provider_entity']}
-			label={m.providerEntity()}
-			hidden={initialData.provider_entity}
-		/>
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<Score
-			{form}
-			label={m.criticality()}
-			field="criticality"
-			always_enabled={true}
-			inversedColors
-			fullDonut
-			min_score={1}
-			max_score={4}
-		/>
-	{:else if URLModel === 'representatives'}
-		<TextField
-			{form}
-			field="email"
-			label={m.email()}
-			cacheLock={cacheLocks['email']}
-			bind:cachedValue={formDataCache['email']}
-			data-focusindex="2"
-		/>
-		{#if !data.user}
-			<Checkbox
-				{form}
-				field="create_user"
-				label={m.createUser()}
-				helpText={m.createUserHelpText()}
-			/>
-		{/if}
-		<AutocompleteSelect
-			{form}
-			options={getOptions({ objects: model.foreignKeys['entity'] })}
-			field="entity"
-			cacheLock={cacheLocks['entity']}
-			bind:cachedValue={formDataCache['entity']}
-			label={m.entity()}
-		/>
-		<TextField
-			{form}
-			field="first_name"
-			label={m.firstName()}
-			cacheLock={cacheLocks['first_name']}
-			bind:cachedValue={formDataCache['first_name']}
-		/>
-		<TextField
-			{form}
-			field="last_name"
-			label={m.lastName()}
-			cacheLock={cacheLocks['last_name']}
-			bind:cachedValue={formDataCache['last_name']}
-		/>
-		<TextField
-			{form}
-			field="phone"
-			label={m.phone()}
-			cacheLock={cacheLocks['phone']}
-			bind:cachedValue={formDataCache['phone']}
-		/>
-		<TextField
-			{form}
-			field="role"
-			label={m.role()}
-			cacheLock={cacheLocks['role']}
-			bind:cachedValue={formDataCache['role']}
-		/>
-	{:else if URLModel === 'frameworks'}
-		<TextField
-			{form}
-			field="ref_id"
-			label={m.ref()}
-			cacheLock={cacheLocks['ref_id']}
-			bind:cachedValue={formDataCache['ref_id']}
-		/>
-		<Select
-			{form}
-			options={model.selectOptions['category']}
-			field="category"
-			label={m.category()}
-			cacheLock={cacheLocks['category']}
-			bind:cachedValue={formDataCache['category']}
-		/>
-	{:else if URLModel === 'users'}
-		<TextField
-			{form}
-			field="email"
-			label={m.email()}
-			cacheLock={cacheLocks['email']}
-			bind:cachedValue={formDataCache['email']}
-			data-focusindex="2"
-		/>
-		{#if shape.first_name && shape.last_name}
-			<TextField
-				{form}
-				field="first_name"
-				label={m.firstName()}
-				cacheLock={cacheLocks['first_name']}
-				bind:cachedValue={formDataCache['first_name']}
-			/>
-			<TextField
-				{form}
-				field="last_name"
-				label={m.lastName()}
-				cacheLock={cacheLocks['last_name']}
-				bind:cachedValue={formDataCache['last_name']}
-			/>
-		{/if}
-		{#if shape.user_groups}
-			<AutocompleteSelect
-				{form}
-				multiple
-				options={getOptions({ objects: model.foreignKeys['user_groups'] })}
-				field="user_groups"
-				cacheLock={cacheLocks['user_groups']}
-				bind:cachedValue={formDataCache['user_groups']}
-				label={m.userGroups()}
-			/>
-		{/if}
-		{#if shape.is_active}
-			<Checkbox {form} field="is_active" label={m.isActive()} helpText={m.isActiveHelpText()} />
-		{/if}
-	{:else if URLModel === 'sso-settings'}
-		<Accordion>
-			<Checkbox {form} field="is_enabled" label={m.enableSSO()} />
-			<AutocompleteSelect
-				{form}
-				hidden={model.selectOptions['provider'].length < 2}
-				field="provider"
-				cacheLock={cacheLocks['provider']}
-				bind:cachedValue={formDataCache['provider']}
-				options={model.selectOptions['provider']}
-				label={m.provider()}
-				disabled={!data.is_enabled}
-			/>
-			{#if data.provider !== 'saml'}
-				<AccordionItem open>
-					<svelte:fragment slot="summary">{m.IdPConfiguration()}</svelte:fragment>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="provider_name"
-							label={m.name()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['provider_name']}
-							bind:cachedValue={formDataCache['provider_name']}
-						/>
-						<TextField
-							hidden
-							{form}
-							field="provider_id"
-							label={m.providerID()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['provider_id']}
-							bind:cachedValue={formDataCache['provider_id']}
-						/>
-						<TextField
-							{form}
-							field="client_id"
-							label={m.clientID()}
-							helpText={m.clientIDHelpText()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['client_id']}
-							bind:cachedValue={formDataCache['client_id']}
-						/>
-						{#if data.provider !== 'saml'}
-							<TextField
-								{form}
-								field="secret"
-								label={m.secret()}
-								helpText={m.secretHelpText()}
-								disabled={!data.is_enabled}
-								cacheLock={cacheLocks['secret']}
-								bind:cachedValue={formDataCache['secret']}
-							/>
-							<TextField
-								{form}
-								field="key"
-								label={m.key()}
-								disabled={!data.is_enabled}
-								cacheLock={cacheLocks['key']}
-								bind:cachedValue={formDataCache['key']}
-							/>
-						{/if}
-					</svelte:fragment>
-				</AccordionItem>
-			{/if}
-			{#if data.provider === 'saml'}
-				<AccordionItem open>
-					<svelte:fragment slot="summary"
-						><span class="font-semibold">{m.SAMLIdPConfiguration()}</span></svelte:fragment
-					>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="idp_entity_id"
-							label={m.IdPEntityID()}
-							required={data.provider === 'saml'}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['idp_entity_id']}
-							bind:cachedValue={formDataCache['idp_entity_id']}
-						/>
-						<p class="text-gray-600 text-sm">Option 1: Fill the metadata url</p>
-						<TextField
-							{form}
-							field="metadata_url"
-							label={m.metadataURL()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['metadata_url']}
-							bind:cachedValue={formDataCache['metadata_url']}
-						/>
-						<div class="flex items-center justify-center w-full space-x-2">
-							<hr class="w-1/2 items-center bg-gray-200 border-0" />
-							<span class="flex items-center text-gray-600 text-sm">{m.or()}</span>
-							<hr class="w-1/2 items-center bg-gray-200 border-0" />
-						</div>
-						<p class="text-gray-600 text-sm">Option 2: Fill the SSO URL, SLO URL and x509cert</p>
-						<TextField
-							{form}
-							field="sso_url"
-							label={m.SSOURL()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['sso_url']}
-							bind:cachedValue={formDataCache['sso_url']}
-						/>
-						<TextField
-							{form}
-							field="slo_url"
-							label={m.SLOURL()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['slo_url']}
-							bind:cachedValue={formDataCache['slo_url']}
-						/>
-						<TextArea
-							{form}
-							field="x509cert"
-							label={m.x509Cert()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['x509cert']}
-							bind:cachedValue={formDataCache['x509cert']}
-						/>
-					</svelte:fragment>
-				</AccordionItem>
-
-				<AccordionItem>
-					<svelte:fragment slot="summary"
-						><span class="font-semibold">{m.SPConfiguration()}</span></svelte:fragment
-					>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="sp_entity_id"
-							label={m.SPEntityID()}
-							required={data.provider === 'saml'}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['sp_entity_id']}
-							bind:cachedValue={formDataCache['sp_entity_id']}
-						/>
-					</svelte:fragment>
-				</AccordionItem>
-
-				<AccordionItem
-					><svelte:fragment slot="summary"
-						><span class="font-semibold">{m.advancedSettings()}</span></svelte:fragment
-					>
-					<svelte:fragment slot="content">
-						<TextField
-							{form}
-							field="attribute_mapping_uid"
-							label={m.attributeMappingUID()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['attribute_mapping_uid']}
-							bind:cachedValue={formDataCache['attribute_mapping_uid']}
-						/>
-						<TextField
-							{form}
-							field="attribute_mapping_email_verified"
-							label={m.attributeMappingEmailVerified()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['attribute_mapping_email_verified']}
-							bind:cachedValue={formDataCache['attribute_mapping_email_verified']}
-						/>
-						<TextField
-							{form}
-							field="attribute_mapping_email"
-							label={m.attributeMappingEmail()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['attribute_mapping_email']}
-							bind:cachedValue={formDataCache['attribute_mapping_email']}
-						/>
-
-						<Checkbox
-							{form}
-							field="allow_repeat_attribute_name"
-							label={m.allowRepeatAttributeName()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="allow_single_label_domains"
-							label={m.allowSingleLabelDomains()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="authn_request_signed"
-							hidden
-							label={m.authnRequestSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<TextField
-							{form}
-							field="digest_algorithm"
-							hidden
-							label={m.digestAlgorithm()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['digest_algorithm']}
-							bind:cachedValue={formDataCache['digest_algorithm']}
-						/>
-						<Checkbox
-							{form}
-							field="logout_request_signed"
-							hidden
-							label={m.logoutRequestSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="logout_response_signed"
-							hidden
-							label={m.logoutResponseSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="metadata_signed"
-							hidden
-							label={m.metadataSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="name_id_encrypted"
-							hidden
-							label={m.nameIDEncrypted()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							hidden
-							field="reject_deprecated_algorithm"
-							label={m.rejectDeprecatedAlgorithm()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="reject_idp_initiated_sso"
-							label={m.rejectIdPInitiatedSSO()}
-							disabled={!data.is_enabled}
-						/>
-						<TextField
-							{form}
-							field="signature_algorithm"
-							hidden
-							label={m.signatureAlgorithm()}
-							disabled={!data.is_enabled}
-							cacheLock={cacheLocks['signature_algorithm']}
-							bind:cachedValue={formDataCache['signature_algorithm']}
-						/>
-						<Checkbox
-							{form}
-							field="want_assertion_encrypted"
-							hidden
-							label={m.wantAssertionEncrypted()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_assertion_signed"
-							hidden
-							label={m.wantAssertionSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_attribute_statement"
-							label={m.wantAttributeStatement()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_message_signed"
-							hidden
-							label={m.wantMessageSigned()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_name_id"
-							label={m.wantNameID()}
-							disabled={!data.is_enabled}
-						/>
-						<Checkbox
-							{form}
-							field="want_name_id_encrypted"
-							hidden
-							label={m.wantNameIDEncrypted()}
-							disabled={!data.is_enabled}
-						/>
-					</svelte:fragment>
-				</AccordionItem>
-			{/if}
-		</Accordion>
-	{/if}
-	<div class="flex flex-row justify-between space-x-4">
-		{#if closeModal}
-			<button
-				class="btn bg-gray-400 text-white font-semibold w-full"
-				data-testid="cancel-button"
-				type="button"
-				on:click={(event) => {
-					parent.onClose(event);
-					createModalCache.deleteCache(model.urlModel);
-				}}>{m.cancel()}</button
-			>
-			<button
-				class="btn variant-filled-primary font-semibold w-full"
-				data-testid="save-button"
-				type="submit"
-				on:click={(event) => {
-					createModalCache.deleteCache(model.urlModel);
-				}}>{m.save()}</button
-			>
-		{:else}
-			{#if cancelButton}
-				<button
-					class="btn bg-gray-400 text-white font-semibold w-full"
-					data-testid="cancel-button"
-					type="button"
-					on:click={cancel}>{m.cancel()}</button
-				>
-			{/if}
-			<button
-				class="btn variant-filled-primary font-semibold w-full"
-				data-testid="save-button"
-				type="submit">{m.save()}</button
-			>
-		{/if}
-	</div>
-</SuperForm>
diff --git a/enterprise/frontend/src/lib/components/Forms/ModelForm/FolderForm.svelte b/enterprise/frontend/src/lib/components/Forms/ModelForm/FolderForm.svelte
new file mode 100644
index 000000000..f9123d39a
--- /dev/null
+++ b/enterprise/frontend/src/lib/components/Forms/ModelForm/FolderForm.svelte
@@ -0,0 +1,23 @@
+<script lang="ts">
+	import { getOptions } from '$lib/utils/crud';
+	import type { CacheLock, ModelInfo } from '$lib/utils/types';
+	import * as m from '$paraglide/messages.js';
+	import type { SuperValidated } from 'sveltekit-superforms';
+	import AutocompleteSelect from '../AutocompleteSelect.svelte';
+
+	export let form: SuperValidated<any>;
+	export let model: ModelInfo;
+	export let cacheLocks: Record<string, CacheLock> = {};
+	export let formDataCache: Record<string, any> = {};
+	export let initialData: Record<string, any> = {};
+</script>
+
+<AutocompleteSelect
+	{form}
+	options={getOptions({ objects: model.foreignKeys['parent_folder'] })}
+	field="parent_folder"
+	cacheLock={cacheLocks['parent_folder']}
+	bind:cachedValue={formDataCache['parent_folder']}
+	label={m.parentDomain()}
+	hide={initialData.parent_folder}
+/>
diff --git a/frontend/messages/ar.json b/frontend/messages/ar.json
index e7c14d304..8ff33880a 100644
--- a/frontend/messages/ar.json
+++ b/frontend/messages/ar.json
@@ -145,6 +145,7 @@
 	"justification": "التبرير",
 	"parentFolder": "المجلد الرئيسي",
 	"contentType": "نوع المحتوى",
+	"objectType": "نوع الكائن",
 	"type": "النوع",
 	"lcStatus": "حالة LC",
 	"internalReference": "المرجع الداخلي",
diff --git a/frontend/messages/de.json b/frontend/messages/de.json
index 16dba3009..ba2b3b7d3 100644
--- a/frontend/messages/de.json
+++ b/frontend/messages/de.json
@@ -156,6 +156,7 @@
 	"justification": "Begründung",
 	"parentFolder": "Übergeordneter Ordner",
 	"contentType": "Inhaltstyp",
+	"objectType": "Objekttyp",
 	"type": "Typ",
 	"lcStatus": "Status",
 	"internalReference": "Interne Referenz",
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index 8a047525b..1558fdb8a 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -157,6 +157,7 @@
 	"justification": "Justification",
 	"parentFolder": "Parent folder",
 	"contentType": "Content type",
+	"objectType": "Object type",
 	"type": "Type",
 	"lcStatus": "Status",
 	"internalReference": "Internal reference",
diff --git a/frontend/messages/es.json b/frontend/messages/es.json
index df0cc23e1..3ab1f6881 100644
--- a/frontend/messages/es.json
+++ b/frontend/messages/es.json
@@ -156,6 +156,7 @@
 	"justification": "Justificación",
 	"parentFolder": "Carpeta principal",
 	"contentType": "Tipo de contenido",
+	"objectType": "abcdef",
 	"type": "Tipo",
 	"lcStatus": "Estado",
 	"internalReference": "Referencia interna",
diff --git a/frontend/messages/fr.json b/frontend/messages/fr.json
index 64c376308..5155a3894 100644
--- a/frontend/messages/fr.json
+++ b/frontend/messages/fr.json
@@ -156,6 +156,7 @@
 	"justification": "Justification",
 	"parentFolder": "Domaine parent",
 	"contentType": "Type de contenu",
+	"objectType": "Type d'objet",
 	"type": "Type",
 	"lcStatus": "Statut",
 	"internalReference": "Référence interne",
diff --git a/frontend/messages/hi.json b/frontend/messages/hi.json
index 9effdf8e8..f1db6f897 100644
--- a/frontend/messages/hi.json
+++ b/frontend/messages/hi.json
@@ -154,6 +154,7 @@
 	"justification": "औचित्य",
 	"parentFolder": "अभिभावक फ़ोल्डर",
 	"contentType": "सामग्री प्रकार",
+	"objectType": "ऑब्जेक्ट प्रकार",
 	"type": "प्रकार",
 	"lcStatus": "स्थिति",
 	"internalReference": "आंतरिक संदर्भ",
diff --git a/frontend/messages/it.json b/frontend/messages/it.json
index 1f5981730..c425d66ea 100644
--- a/frontend/messages/it.json
+++ b/frontend/messages/it.json
@@ -156,6 +156,7 @@
 	"justification": "Giustificazione",
 	"parentFolder": "Cartella principale",
 	"contentType": "Tipo di contenuto",
+	"objectType": "Tipo di oggetto",
 	"type": "Tipo",
 	"lcStatus": "Stato",
 	"internalReference": "Riferimento interno",
diff --git a/frontend/messages/nl.json b/frontend/messages/nl.json
index 73a343c28..462af7c6b 100644
--- a/frontend/messages/nl.json
+++ b/frontend/messages/nl.json
@@ -156,6 +156,7 @@
 	"justification": "Rechtvaardiging",
 	"parentFolder": "Bovenliggende map",
 	"contentType": "Inhoudstype",
+	"objectType": "Objecttype",
 	"type": "Type",
 	"lcStatus": "Status",
 	"internalReference": "Interne referentie",
diff --git a/frontend/messages/pl.json b/frontend/messages/pl.json
index 7047be37e..d1112f001 100644
--- a/frontend/messages/pl.json
+++ b/frontend/messages/pl.json
@@ -156,6 +156,7 @@
 	"justification": "Uzasadnienie",
 	"parentFolder": "Folder nadrzędny",
 	"contentType": "Rodzaj treści",
+	"objectType": "Typ obiektu",
 	"type": "Typ",
 	"lcStatus": "Status LC",
 	"internalReference": "Referencja wewnętrzna",
diff --git a/frontend/messages/pt.json b/frontend/messages/pt.json
index 9f4836ab8..e72d39de5 100644
--- a/frontend/messages/pt.json
+++ b/frontend/messages/pt.json
@@ -156,6 +156,7 @@
 	"justification": "Justificativa",
 	"parentFolder": "Pasta pai",
 	"contentType": "Tipo de conteúdo",
+	"objectType": "Tipo de objeto",
 	"type": "Tipo",
 	"lcStatus": "Status",
 	"internalReference": "Referência interna",
diff --git a/frontend/messages/ro.json b/frontend/messages/ro.json
index 4a5226b39..1a1522311 100644
--- a/frontend/messages/ro.json
+++ b/frontend/messages/ro.json
@@ -152,6 +152,7 @@
 	"justification": "Justificare",
 	"parentFolder": "Dosar părinte",
 	"contentType": "Tip conținut",
+	"objectType": "Tipul obiectului",
 	"type": "Tip",
 	"lcStatus": "Stare LC",
 	"internalReference": "Referință internă",
diff --git a/frontend/messages/ur.json b/frontend/messages/ur.json
index a3020efaf..973b9d377 100644
--- a/frontend/messages/ur.json
+++ b/frontend/messages/ur.json
@@ -154,6 +154,7 @@
 	"justification": "جواز",
 	"parentFolder": "مرکزی فولڈر",
 	"contentType": "مواد کی قسم",
+	"objectType": "آبجیکٹ کی قسم",
 	"type": "قسم",
 	"lcStatus": "حیثیت",
 	"internalReference": "داخلی حوالہ",
diff --git a/frontend/src/lib/components/Chart/TreeChart.svelte b/frontend/src/lib/components/Chart/TreeChart.svelte
index d94357e52..957da77f3 100644
--- a/frontend/src/lib/components/Chart/TreeChart.svelte
+++ b/frontend/src/lib/components/Chart/TreeChart.svelte
@@ -1,6 +1,5 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	export let s_label = '';
 
 	export let width = 'w-auto';
 	export let height = 'h-full';
diff --git a/frontend/src/lib/components/DetailView/DetailView.svelte b/frontend/src/lib/components/DetailView/DetailView.svelte
index 948213110..598ba9f19 100644
--- a/frontend/src/lib/components/DetailView/DetailView.svelte
+++ b/frontend/src/lib/components/DetailView/DetailView.svelte
@@ -3,6 +3,7 @@
 	import { page } from '$app/stores';
 	import ConfirmModal from '$lib/components/Modals/ConfirmModal.svelte';
 	import CreateModal from '$lib/components/Modals/CreateModal.svelte';
+	import MissingConstraintsModal from '$lib/components/Modals/MissingConstraintsModal.svelte';
 	import ModelTable from '$lib/components/ModelTable/ModelTable.svelte';
 	import type {
 		ModalComponent,
@@ -17,6 +18,7 @@
 	import { URL_MODEL_MAP } from '$lib/utils/crud';
 	import { isURL } from '$lib/utils/helpers';
 	import { toCamelCase, capitalizeFirstLetter } from '$lib/utils/locales.js';
+	import { checkConstraints } from '$lib/utils/crud';
 	import { languageTag } from '$paraglide/runtime.js';
 	import * as m from '$paraglide/messages.js';
 	import { ISO_8601_REGEX } from '$lib/utils/constants';
@@ -70,7 +72,7 @@
 	}
 
 	function modalCreateForm(model: Record<string, any>): void {
-		const modalComponent: ModalComponent = {
+		let modalComponent: ModalComponent = {
 			ref: CreateModal,
 			props: {
 				form: model.createForm,
@@ -78,12 +80,24 @@
 				debug: false
 			}
 		};
-		const modal: ModalSettings = {
+		let modal: ModalSettings = {
 			type: 'component',
 			component: modalComponent,
 			// Data
 			title: safeTranslate('add' + capitalizeFirstLetter(model.info.localName))
 		};
+		if (checkConstraints(model.createForm.constraints, model.foreignKeys).length > 0) {
+			modalComponent = {
+				ref: MissingConstraintsModal
+			};
+			modal = {
+				type: 'component',
+				component: modalComponent,
+				title: m.warning(),
+				body: safeTranslate('add' + capitalizeFirstLetter(model.info.localName)).toLowerCase(),
+				value: checkConstraints(model.createForm.constraints, model.foreignKeys)
+			};
+		}
 		modalStore.trigger(modal);
 	}
 
diff --git a/frontend/src/lib/components/Forms/ModelForm.svelte b/frontend/src/lib/components/Forms/ModelForm.svelte
index 458849090..8b3099750 100644
--- a/frontend/src/lib/components/Forms/ModelForm.svelte
+++ b/frontend/src/lib/components/Forms/ModelForm.svelte
@@ -23,6 +23,7 @@
 	import FrameworksForm from './ModelForm/FrameworkForm.svelte';
 	import UsersForm from './ModelForm/UserForm.svelte';
 	import SsoSettingsForm from './ModelForm/SsoSettingForm.svelte';
+	import FolderForm from './ModelForm/FolderForm.svelte';
 
 	import AutocompleteSelect from './AutocompleteSelect.svelte';
 
@@ -175,6 +176,8 @@
 	{/if}
 	{#if URLModel === 'projects'}
 		<ProjectForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
+	{:else if URLModel === 'folders'}
+		<FolderForm {form} {model} {cacheLocks} {formDataCache} {initialData} />
 	{:else if URLModel === 'risk-assessments' || URLModel === 'risk-assessment-duplicate'}
 		<RiskAssessmentForm
 			{form}
diff --git a/frontend/src/lib/components/Forms/ModelForm/FolderForm.svelte b/frontend/src/lib/components/Forms/ModelForm/FolderForm.svelte
new file mode 100644
index 000000000..493605a89
--- /dev/null
+++ b/frontend/src/lib/components/Forms/ModelForm/FolderForm.svelte
@@ -0,0 +1,4 @@
+<script lang="ts">
+	// NOTE: The community version of FolderForm does nothing special at the moment.
+	// It was created to simplify operations.
+</script>
diff --git a/frontend/src/lib/components/Forms/Score.svelte b/frontend/src/lib/components/Forms/Score.svelte
index d094e05b4..2a85457a8 100644
--- a/frontend/src/lib/components/Forms/Score.svelte
+++ b/frontend/src/lib/components/Forms/Score.svelte
@@ -26,8 +26,6 @@
 	export let form: SuperForm<Record<string, any>>;
 	const { value, errors, constraints } = formFieldProxy(form, field);
 
-	$value = $value ?? min_score;
-
 	let isScored = formFieldProxy(form, 'is_scored')['value'];
 
 	if (always_enabled) {
diff --git a/frontend/src/lib/utils/crud.ts b/frontend/src/lib/utils/crud.ts
index 99da36886..62bd8ad52 100644
--- a/frontend/src/lib/utils/crud.ts
+++ b/frontend/src/lib/utils/crud.ts
@@ -17,7 +17,7 @@ type GetOptionsParams = {
 	selfSelect?: boolean;
 };
 
-export function checkConstraints(constraints: { [key: string]: any }, foreignKeys: any) {
+export function checkConstraints(constraints: { [key: string]: any }, foreignKeys: any): string[] {
 	const emptyConstraintsList = [];
 	for (const [key, constraint] of Object.entries(constraints)) {
 		if (constraint.required && foreignKeys[key])
diff --git a/frontend/src/lib/utils/helpers.ts b/frontend/src/lib/utils/helpers.ts
index 367b679f1..e40ce9e98 100644
--- a/frontend/src/lib/utils/helpers.ts
+++ b/frontend/src/lib/utils/helpers.ts
@@ -60,7 +60,7 @@ export function formatScoreValue(value: number, max_score: number, fullDonut = f
 }
 
 export function getSecureRedirect(url: any): string {
-	const SECURE_REDIRECT_URL_REGEX = /^\/(?!.*\/\/)[^\s]*$/;
+	const SECURE_REDIRECT_URL_REGEX = /^\/[^/]/;
 	return typeof url === 'string' && SECURE_REDIRECT_URL_REGEX.test(url) ? url : '';
 }
 
diff --git a/frontend/src/lib/utils/table.ts b/frontend/src/lib/utils/table.ts
index e3bc7eb21..2e5994eb2 100644
--- a/frontend/src/lib/utils/table.ts
+++ b/frontend/src/lib/utils/table.ts
@@ -227,6 +227,31 @@ const OWNER_FILTER: ListViewFilterConfig = {
   }
 }; */
 
+const LIBRARY_TYPE_FILTER = {
+	component: SelectFilter,
+	getColumn: (row) => {
+		const overviewKeys = new Set(row.overview.map((overviewRow) => overviewRow.split(':')[0]));
+		const libraryDatatypeSet = new Set([
+			'framework',
+			'risk_matrix',
+			'threats',
+			'requirement_mapping_set',
+			'reference_controls'
+		]);
+		const datatypes = [...libraryDatatypeSet].filter((datatype) => overviewKeys.has(datatype));
+		return datatypes;
+	},
+	extraProps: {
+		defaultOptionName: 'objectType',
+		optionLabels: {
+			reference_controls: 'referenceControls',
+			requirement_mapping_set: 'requirementMappingSet',
+			risk_matrix: 'riskMatrix'
+		}
+	},
+	alwaysDisplay: true
+};
+
 export const listViewFields: ListViewFieldsConfig = {
 	folders: {
 		head: ['name', 'description', 'parentDomain'],
@@ -409,8 +434,8 @@ export const listViewFields: ListViewFieldsConfig = {
 		body: ['provider', 'name', 'description', 'locales', 'overview'],
 		filters: {
 			locales: LANGUAGE_FILTER,
-			provider: PROVIDER_FILTER_FOR_LIBRARIES
-			// has_risk_matrix: HAS_RISK_MATRIX_FILTER
+			provider: PROVIDER_FILTER_FOR_LIBRARIES,
+			objectType: LIBRARY_TYPE_FILTER
 		}
 	},
 	'loaded-libraries': {
@@ -418,7 +443,8 @@ export const listViewFields: ListViewFieldsConfig = {
 		body: ['provider', 'name', 'description', 'locales', 'overview'],
 		filters: {
 			locales: LANGUAGE_FILTER,
-			provider: PROVIDER_FILTER_FOR_LIBRARIES
+			provider: PROVIDER_FILTER_FOR_LIBRARIES,
+			objectType: LIBRARY_TYPE_FILTER
 		}
 	},
 	'sso-settings': {
diff --git a/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/attachment/+server.ts b/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/attachment/+server.ts
index ed87e123c..9ac07bd10 100644
--- a/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/attachment/+server.ts
+++ b/frontend/src/routes/(app)/(third-party)/evidences/[id=uuid]/attachment/+server.ts
@@ -29,9 +29,13 @@ export const GET: RequestHandler = async ({ fetch, setHeaders, params }) => {
 		}
 
 		const reader = attachmentResponse.body.getReader();
+		let readerTerminated = false;
 		const stream = new ReadableStream({
 			start(controller) {
 				function push() {
+					if (readerTerminated) {
+						return;
+					}
 					reader.read().then(({ done, value }) => {
 						if (done) {
 							controller.close();
@@ -42,6 +46,9 @@ export const GET: RequestHandler = async ({ fetch, setHeaders, params }) => {
 					});
 				}
 				push();
+			},
+			cancel() {
+				readerTerminated = true;
 			}
 		});
 
diff --git a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.server.ts b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.server.ts
index 965b61acb..255d8ae8e 100644
--- a/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.server.ts
+++ b/frontend/src/routes/(app)/(third-party)/requirement-assessments/[id=uuid]/edit/+page.server.ts
@@ -49,6 +49,7 @@ export const load = (async ({ fetch, params }) => {
 	});
 
 	const schema = modelSchema(URLModel);
+	object.evidences = object.evidences.map((evidence) => evidence.id);
 	const form = await superValidate(object, zod(schema), { errors: true });
 
 	const foreignKeys: Record<string, any> = {};
@@ -102,12 +103,40 @@ export const load = (async ({ fetch, params }) => {
 					measureSelectOptions[selectField.field] = Object.entries(data).map(([key, value]) => ({
 						label: value,
 						value: key
-					}));
+					}))
+				
+				} else {
+					console.error(`Failed to fetch data for ${selectField.field}: ${response.statusText}`);
 				}
 			})
-		);
+		)
 	}
-	measureModel.selectOptions = measureSelectOptions;
+
+	measureModel['selectOptions'] = measureSelectOptions;
+
+	const tables: Record<string, any> = {};
+
+	await Promise.all(
+		['applied-controls', 'evidences'].map(async (key) => {
+			const keyEndpoint = `${BASE_API_URL}/${key}/?requirement_assessments=${params.id}`;
+			const response = await fetch(keyEndpoint);
+
+			if (response.ok) {
+				const data = await response.json().then((data) => data.results);
+
+				const bodyData = tableSourceMapper(data, listViewFields[key].body);
+
+				const table: TableSource = {
+					head: listViewFields[key].head,
+					body: bodyData,
+					meta: data
+				};
+				tables[key] = table;
+			} else {
+				console.error(`Failed to fetch data for ${key}: ${response.statusText}`);
+			}
+		})
+	);
 
 	const measureForeignKeys: Record<string, any> = {};
 	if (measureModel.foreignKeyFields) {
@@ -128,20 +157,6 @@ export const load = (async ({ fetch, params }) => {
 	}
 	measureModel.foreignKeys = measureForeignKeys;
 
-	const tables: Record<string, any> = {};
-	await Promise.all(
-		['applied-controls', 'evidences'].map(async (key) => {
-			const data = await fetchJson(`${baseUrl}/${key}/?requirement_assessments=${params.id}`);
-			if (data) {
-				tables[key] = {
-					head: listViewFields[key].head,
-					body: tableSourceMapper(data.results, listViewFields[key].body),
-					meta: data.results
-				};
-			}
-		})
-	);
-
 	const evidenceModel = getModelInfo('evidences');
 	const evidenceCreateSchema = modelSchema('evidences');
 	const evidenceCreateForm = await superValidate(
diff --git a/frontend/tests/utils/page-content.ts b/frontend/tests/utils/page-content.ts
index b425aeced..90a34a935 100644
--- a/frontend/tests/utils/page-content.ts
+++ b/frontend/tests/utils/page-content.ts
@@ -66,7 +66,7 @@ export class PageContent extends BasePage {
 	}
 
 	async importLibrary(name: string, urn?: string, language = 'English') {
-		this.page.getByTestId('search-input').fill(name);
+		await this.page.getByTestId('search-input').fill(name);
 		if (
 			(await this.tab('Loaded libraries').isVisible()) &&
 			(await this.tab('Loaded libraries').getAttribute('aria-selected')) === 'true'
@@ -80,10 +80,12 @@ export class PageContent extends BasePage {
 		}
 		// If the library is not visible, it might have already been loaded
 		if (await this.importItemButton(name, language === 'any' ? undefined : language).isHidden()) {
-			await this.tab('Loaded libraries').click();
-			expect(this.tab('Loaded libraries').getAttribute('aria-selected')).toBeTruthy();
-			this.page.getByTestId('search-input').fill(name);
-			expect(this.getRow(name)).toBeVisible();
+			if (await this.tab('Loaded libraries').isVisible()) {
+				await this.tab('Loaded libraries').click();
+				expect(this.tab('Loaded libraries').getAttribute('aria-selected')).toBeTruthy();
+				await this.page.getByTestId('search-input').fill(name);
+			}
+			await expect(this.getRow(name)).toBeVisible();
 			return;
 		}
 		await this.importItemButton(name, language === 'any' ? undefined : language).click();
@@ -92,7 +94,8 @@ export class PageContent extends BasePage {
 		});
 		await this.tab('Loaded libraries').click();
 		expect(this.tab('Loaded libraries').getAttribute('aria-selected')).toBeTruthy();
-		expect(this.getRow(name)).toBeVisible();
+		await this.page.getByTestId('search-input').fill(name);
+		await expect(this.getRow(name)).toBeVisible();
 	}
 
 	async viewItemDetail(value?: string) {
diff --git a/frontend/tests/utils/test-data.ts b/frontend/tests/utils/test-data.ts
index 2d5725daf..3df5269f7 100644
--- a/frontend/tests/utils/test-data.ts
+++ b/frontend/tests/utils/test-data.ts
@@ -26,140 +26,186 @@ export default {
 		analyst: {
 			name: 'Analyst',
 			perms: [
+				'add_appliedcontrol',
+				'add_asset',
+				'add_complianceassessment',
+				'add_evidence',
+				'add_policy',
 				'add_project',
-				'view_project',
-				'change_project',
-				'delete_project',
+				'add_riskacceptance',
 				'add_riskassessment',
-				'view_riskassessment',
-				'change_riskassessment',
-				'delete_riskassessment',
-				'add_appliedcontrol',
-				'view_appliedcontrol',
+				'add_riskscenario',
+				'add_solution',
+				'add_threat',
 				'change_appliedcontrol',
-				'delete_appliedcontrol',
-				'add_policy',
-				'view_policy',
+				'change_asset',
+				'change_complianceassessment',
+				'change_entity',
+				'change_entityassessment',
+				'change_evidence',
 				'change_policy',
-				'delete_policy',
-				'add_riskscenario',
-				'view_riskscenario',
-				'change_riskscenario',
-				'delete_riskscenario',
-				'add_riskacceptance',
-				'view_riskacceptance',
+				'change_project',
+				'change_referencecontrol',
+				'change_representative',
+				'change_requirementassessment',
 				'change_riskacceptance',
-				'delete_riskacceptance',
-				'add_complianceassessment',
-				'view_complianceassessment',
-				'change_complianceassessment',
+				'change_riskassessment',
+				'change_riskscenario',
+				'change_solution',
+				'change_threat',
+				'delete_appliedcontrol',
+				'delete_asset',
 				'delete_complianceassessment',
-				'view_requirementassessment',
-				'change_requirementassessment',
-				'add_evidence',
-				'view_evidence',
-				'change_evidence',
+				'delete_entity',
+				'delete_entityassessment',
 				'delete_evidence',
-				'add_asset',
-				'view_asset',
-				'change_asset',
-				'delete_asset',
-				'add_threat',
-				'view_threat',
-				'change_threat',
+				'delete_policy',
+				'delete_project',
+				'delete_referencecontrol',
+				'delete_representative',
+				'delete_riskacceptance',
+				'delete_riskassessment',
+				'delete_riskscenario',
+				'delete_solution',
 				'delete_threat',
-				'view_referencecontrol',
+				'view_appliedcontrol',
+				'view_asset',
+				'view_complianceassessment',
+				'view_entity',
+				'view_entityassessment',
+				'view_evidence',
 				'view_folder',
-				'view_usergroup',
-				'view_riskmatrix',
-				'view_requirementnode',
 				'view_framework',
 				'view_loadedlibrary',
-				'view_user'
+				'view_policy',
+				'view_project',
+				'view_referencecontrol',
+				'view_representative',
+				'view_requirementassessment',
+				'view_requirementmapping',
+				'view_requirementmappingset',
+				'view_requirementnode',
+				'view_riskacceptance',
+				'view_riskassessment',
+				'view_riskmatrix',
+				'view_riskscenario',
+				'view_solution',
+				'view_storedlibrary',
+				'view_threat',
+				'view_user',
+				'view_usergroup'
 			]
 		},
 		reader: {
 			name: 'Reader',
 			perms: [
-				'view_project',
-				'view_riskassessment',
 				'view_appliedcontrol',
-				'view_policy',
-				'view_riskscenario',
-				'view_riskacceptance',
 				'view_asset',
-				'view_threat',
-				'view_referencecontrol',
-				'view_folder',
-				'view_usergroup',
-				'view_riskmatrix',
 				'view_complianceassessment',
-				'view_requirementassessment',
-				'view_requirementnode',
+				'view_entity',
+				'view_entityassessment',
 				'view_evidence',
+				'view_folder',
 				'view_framework',
 				'view_loadedlibrary',
-				'view_user'
+				'view_policy',
+				'view_project',
+				'view_referencecontrol',
+				'view_representative',
+				'view_requirementassessment',
+				'view_requirementmapping',
+				'view_requirementmappingset',
+				'view_requirementnode',
+				'view_riskacceptance',
+				'view_riskassessment',
+				'view_riskmatrix',
+				'view_riskscenario',
+				'view_solution',
+				'view_storedlibrary',
+				'view_threat',
+				'view_user',
+				'view_usergroup'
 			]
 		},
 		domainManager: {
 			name: 'Domain manager',
 			perms: [
-				'change_usergroup',
-				'view_usergroup',
-				'add_project',
-				'change_project',
-				'delete_project',
-				'view_project',
-				'add_riskassessment',
-				'view_riskassessment',
-				'change_riskassessment',
-				'delete_riskassessment',
 				'add_appliedcontrol',
-				'view_appliedcontrol',
-				'change_appliedcontrol',
-				'delete_appliedcontrol',
+				'add_asset',
+				'add_complianceassessment',
+				'add_entity',
+				'add_entityassessment',
+				'add_evidence',
+				'add_folder',
 				'add_policy',
-				'view_policy',
-				'change_policy',
-				'delete_policy',
-				'add_riskscenario',
-				'view_riskscenario',
-				'change_riskscenario',
-				'delete_riskscenario',
+				'add_project',
 				'add_riskacceptance',
-				'view_riskacceptance',
-				'change_riskacceptance',
-				'delete_riskacceptance',
-				'add_asset',
-				'view_asset',
-				'change_asset',
-				'delete_asset',
+				'add_riskassessment',
+				'add_riskmatrix',
+				'add_riskscenario',
+				'add_solution',
 				'add_threat',
-				'view_threat',
-				'change_threat',
-				'delete_threat',
-				'view_referencecontrol',
-				'view_folder',
+				'change_appliedcontrol',
+				'change_asset',
+				'change_complianceassessment',
+				'change_entity',
+				'change_entityassessment',
+				'change_evidence',
 				'change_folder',
-				'add_riskmatrix',
-				'view_riskmatrix',
+				'change_policy',
+				'change_project',
+				'change_referencecontrol',
+				'change_representative',
+				'change_requirementassessment',
+				'change_riskacceptance',
+				'change_riskassessment',
 				'change_riskmatrix',
+				'change_riskscenario',
+				'change_solution',
+				'change_threat',
+				'delete_appliedcontrol',
+				'delete_asset',
+				'delete_complianceassessment',
+				'delete_entity',
+				'delete_entityassessment',
+				'delete_evidence',
+				'delete_folder',
+				'delete_policy',
+				'delete_project',
+				'delete_referencecontrol',
+				'delete_representative',
+				'delete_riskacceptance',
+				'delete_riskassessment',
 				'delete_riskmatrix',
-				'add_complianceassessment',
+				'delete_riskscenario',
+				'delete_solution',
+				'delete_threat',
+				'view_appliedcontrol',
+				'view_asset',
 				'view_complianceassessment',
-				'change_complianceassessment',
-				'delete_complianceassessment',
-				'view_requirementassessment',
-				'change_requirementassessment',
-				'add_evidence',
+				'view_entity',
+				'view_entityassessment',
 				'view_evidence',
-				'change_evidence',
-				'delete_evidence',
-				'view_requirementnode',
+				'view_folder',
 				'view_framework',
 				'view_loadedlibrary',
-				'view_user'
+				'view_policy',
+				'view_project',
+				'view_referencecontrol',
+				'view_representative',
+				'view_requirementassessment',
+				'view_requirementmapping',
+				'view_requirementmappingset',
+				'view_requirementnode',
+				'view_riskacceptance',
+				'view_riskassessment',
+				'view_riskmatrix',
+				'view_riskscenario',
+				'view_solution',
+				'view_storedlibrary',
+				'view_threat',
+				'view_user',
+				'view_usergroup'
 			]
 		},
 		approver: {
@@ -183,8 +229,11 @@ export default {
 				'view_requirementnode',
 				'view_evidence',
 				'view_framework',
+				'view_storedlibrary',
 				'view_loadedlibrary',
-				'view_user'
+				'view_user',
+				'view_requirementmappingset',
+				'view_requirementmapping'
 			]
 		}
 	},