diff --git a/opencti-platform/opencti-graphql/src/modules/ingestion/ingestion-rss.ts b/opencti-platform/opencti-graphql/src/modules/ingestion/ingestion-rss.ts
index 76915865ea325..56d9647a2277a 100644
--- a/opencti-platform/opencti-graphql/src/modules/ingestion/ingestion-rss.ts
+++ b/opencti-platform/opencti-graphql/src/modules/ingestion/ingestion-rss.ts
@@ -29,15 +29,15 @@ const INGESTION_RSS_DEFINITION: ModuleDefinition<StoreEntityIngestionRss, StixIn
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'description', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true },
-    { name: 'uri', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true },
-    { name: 'user_id', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true },
-    { name: 'report_types', type: 'string', mandatoryType: 'external', editDefault: true, multiple: true, upsert: true },
-    { name: 'created_by_ref', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'object_marking_refs', type: 'string', mandatoryType: 'external', editDefault: true, multiple: true, upsert: true },
-    { name: 'current_state_date', type: 'date', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'ingestion_running', type: 'boolean', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'uri', label: 'URI', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'user_id', label: 'User ID', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'report_types', label: 'Report types', type: 'string', mandatoryType: 'external', editDefault: true, multiple: true, upsert: true, isFilterable: true },
+    { name: 'created_by_ref', label: 'Created by', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: false },
+    { name: 'object_marking_refs', label: 'Marking', type: 'string', mandatoryType: 'external', editDefault: true, multiple: true, upsert: true, isFilterable: false },
+    { name: 'current_state_date', label: 'Current state date', type: 'date', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'ingestion_running', label: 'Ingestion running', type: 'boolean', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
   ],
   relations: [],
   representative: (stix: StixIngestionRss) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/ingestion/ingestion-taxii.ts b/opencti-platform/opencti-graphql/src/modules/ingestion/ingestion-taxii.ts
index 60cf30691d920..1c7bc4e985336 100644
--- a/opencti-platform/opencti-graphql/src/modules/ingestion/ingestion-taxii.ts
+++ b/opencti-platform/opencti-graphql/src/modules/ingestion/ingestion-taxii.ts
@@ -29,20 +29,20 @@ const INGESTION_DEFINITION: ModuleDefinition<StoreEntityIngestionTaxii, StixInge
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'description', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true },
-    { name: 'uri', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true },
-    { name: 'version', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: true },
-    { name: 'collection', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: true },
-    { name: 'authentication_type', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true },
-    { name: 'authentication_value', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true },
-    { name: 'user_id', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true },
-    { name: 'report_types', type: 'string', mandatoryType: 'external', editDefault: true, multiple: true, upsert: true },
-    { name: 'created_by_ref', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'object_marking_refs', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'added_after_start', type: 'date', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'current_state_cursor', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'ingestion_running', type: 'boolean', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'uri', label: 'URI', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'version', label: 'Version', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'collection', label: 'Collection', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'authentication_type', label: 'Authentication type', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'authentication_value', label: 'Authentication value', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'user_id', label: 'User ID', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'report_types', label: 'Report types', type: 'string', mandatoryType: 'external', editDefault: true, multiple: true, upsert: true, isFilterable: true },
+    { name: 'created_by_ref', label: 'Created by', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: false },
+    { name: 'object_marking_refs', label: 'Marking', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: false },
+    { name: 'added_after_start', label: 'Added after', type: 'date', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'current_state_cursor', label: 'Current state cursor', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'ingestion_running', label: 'Running', type: 'boolean', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
   ],
   relations: [],
   representative: (stix: StixIngestionTaxii) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/internal/csvMapper/csvMapper.ts b/opencti-platform/opencti-graphql/src/modules/internal/csvMapper/csvMapper.ts
index 4fa50bad94e88..e6d9e12a150e8 100644
--- a/opencti-platform/opencti-graphql/src/modules/internal/csvMapper/csvMapper.ts
+++ b/opencti-platform/opencti-graphql/src/modules/internal/csvMapper/csvMapper.ts
@@ -30,11 +30,11 @@ const CSV_MAPPER_DEFINITION: ModuleDefinition<StoreEntityCsvMapper, StixCsvMappe
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'has_header', type: 'boolean', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'separator', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'representations', type: 'json', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'skipLineChar', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'has_header', label: 'Header', type: 'boolean', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'separator', label: 'Separator', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'representations', label: 'Representations', type: 'json', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: false },
+    { name: 'skipLineChar', label: 'Skip line character', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
   ],
   relations: [],
   representative: (instance: StixCsvMapper) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/internal/document/document.ts b/opencti-platform/opencti-graphql/src/modules/internal/document/document.ts
index 23e9708e92bbb..a128006536dcb 100644
--- a/opencti-platform/opencti-graphql/src/modules/internal/document/document.ts
+++ b/opencti-platform/opencti-graphql/src/modules/internal/document/document.ts
@@ -5,7 +5,7 @@ import type { AttributeDefinition } from '../../../schema/attribute-definition';
 // Register at minimum lastModified attribute
 // This way the search engine is able to order by lastModified
 const attributes: Array<AttributeDefinition> = [
-  { name: 'lastModified', type: 'date', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
+  { name: 'lastModified', label: 'Last modification date', type: 'date', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
 ];
 
 schemaAttributesDefinition.registerAttributes(ENTITY_TYPE_INTERNAL_FILE, attributes);
diff --git a/opencti-platform/opencti-graphql/src/modules/language/language.ts b/opencti-platform/opencti-graphql/src/modules/language/language.ts
index ba4b312ca58b4..8a6efc8d521ff 100644
--- a/opencti-platform/opencti-graphql/src/modules/language/language.ts
+++ b/opencti-platform/opencti-graphql/src/modules/language/language.ts
@@ -29,7 +29,7 @@ const LANGUAGE_DEFINITION: ModuleDefinition<StoreEntityLanguage, StixLanguage> =
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
   ],
   relations: [], // All relations are from the other side
   representative: (stix: StixLanguage) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/malwareAnalysis/malwareAnalysis.ts b/opencti-platform/opencti-graphql/src/modules/malwareAnalysis/malwareAnalysis.ts
index 6575af2ac93ea..fa98d2fd0ea70 100644
--- a/opencti-platform/opencti-graphql/src/modules/malwareAnalysis/malwareAnalysis.ts
+++ b/opencti-platform/opencti-graphql/src/modules/malwareAnalysis/malwareAnalysis.ts
@@ -52,17 +52,17 @@ const MALWARE_ANALYSIS_DEFINITION: ModuleDefinition<StoreEntityMalwareAnalysis,
     resolvers: {}
   },
   attributes: [
-    { name: 'product', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'version', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true },
-    { name: 'configuration_version', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, label: 'Configuration version' },
-    { name: 'modules', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: true, upsert: true },
-    { name: 'analysis_engine_version', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, label: 'Analysis engine version' },
-    { name: 'analysis_definition_version', mandatoryType: 'customizable', editDefault: true, type: 'string', multiple: false, upsert: true, label: 'Analysis definition version' },
-    { name: 'submitted', type: 'date', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, label: 'Submission date' },
-    { name: 'analysis_started', type: 'date', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, label: 'Analysis started' },
-    { name: 'analysis_ended', type: 'date', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, label: 'Analysis ended' },
-    { name: 'result_name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, label: 'Result name' },
-    { name: 'result', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true },
+    { name: 'product', label: 'Product', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'version', label: 'Version', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'configuration_version', label: 'Configuration version', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'modules', label: 'Modules', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: true, upsert: true, isFilterable: true },
+    { name: 'analysis_engine_version', label: 'Analysis engine version', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'analysis_definition_version', label: 'Analysis definition version', mandatoryType: 'customizable', editDefault: true, type: 'string', multiple: false, upsert: true, isFilterable: true },
+    { name: 'submitted', label: 'Submission date', type: 'date', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'analysis_started', label: 'Analysis started', type: 'date', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'analysis_ended', label: 'Analysis ended', type: 'date', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'result_name', label: 'Result name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'result', label: 'Result', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
   ],
   converter: convertMalwareAnalysisToStix,
   representative: (stix: StixMalwareAnalysis) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/managerConfiguration/managerConfiguration.ts b/opencti-platform/opencti-graphql/src/modules/managerConfiguration/managerConfiguration.ts
index c66e7276019bd..eb6f0eccee69e 100644
--- a/opencti-platform/opencti-graphql/src/modules/managerConfiguration/managerConfiguration.ts
+++ b/opencti-platform/opencti-graphql/src/modules/managerConfiguration/managerConfiguration.ts
@@ -28,11 +28,11 @@ const MANAGER_CONFIGURATION_DEFINITION: ModuleDefinition<StoreEntityManagerConfi
     },
   },
   attributes: [
-    { name: 'manager_id', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'manager_running', type: 'boolean', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'manager_setting', type: 'json', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'last_run_start_date', type: 'date', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'last_run_end_date', type: 'date', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
+    { name: 'manager_id', label: 'Manager ID', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: false },
+    { name: 'manager_running', label: 'Running', type: 'boolean', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'manager_setting', label: 'Setting', type: 'json', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: false },
+    { name: 'last_run_start_date', label: 'Last run start date', type: 'date', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'last_run_end_date', label: 'Last run end date', type: 'date', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
   ],
   relations: [],
   representative: (stix: StixManagerConfiguration) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/narrative/narrative.ts b/opencti-platform/opencti-graphql/src/modules/narrative/narrative.ts
index 1342fe2701252..dc1607bb07d4a 100644
--- a/opencti-platform/opencti-graphql/src/modules/narrative/narrative.ts
+++ b/opencti-platform/opencti-graphql/src/modules/narrative/narrative.ts
@@ -31,9 +31,9 @@ const NARRATIVE_DEFINITION: ModuleDefinition<StoreEntityNarrative, StixNarrative
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'description', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true },
-    { name: 'narrative_types', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, label: 'Narrative types' },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'narrative_types', label: 'Narrative types', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, isFilterable: true },
   ],
   relations: [
     {
diff --git a/opencti-platform/opencti-graphql/src/modules/notification/notification.ts b/opencti-platform/opencti-graphql/src/modules/notification/notification.ts
index ca3d72e38a1b6..7c4bbfc91d3a8 100644
--- a/opencti-platform/opencti-graphql/src/modules/notification/notification.ts
+++ b/opencti-platform/opencti-graphql/src/modules/notification/notification.ts
@@ -34,20 +34,20 @@ const TRIGGER_DEFINITION: ModuleDefinition<StoreEntityTrigger, StixTrigger> = {
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: false },
-    { name: 'description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'event_types', type: 'string', mandatoryType: 'external', editDefault: true, multiple: true, upsert: false },
-    { name: 'trigger_scope', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'notifiers', type: 'string', mandatoryType: 'external', editDefault: true, multiple: true, upsert: false },
-    { name: 'filters', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'recipients', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
-    { name: 'trigger_ids', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
-    { name: 'period', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'trigger_time', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'authorized_members', type: 'json', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
-    { name: 'authorized_authorities', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
-    { name: 'instance_trigger', type: 'boolean', mandatoryType: 'external', editDefault: true, multiple: false, upsert: false },
-    { name: 'trigger_type', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: false, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'event_types', label: 'Event types', type: 'string', mandatoryType: 'external', editDefault: true, multiple: true, upsert: false, isFilterable: true },
+    { name: 'trigger_scope', label: 'Trigger scope', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'notifiers', label: 'Notifiers', type: 'string', mandatoryType: 'external', editDefault: true, multiple: true, upsert: false, isFilterable: true },
+    { name: 'filters', label: 'Filters', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'recipients', label: 'Recipients', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: false },
+    { name: 'trigger_ids', label: 'Trigger IDs', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: false },
+    { name: 'period', label: 'Period', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'trigger_time', label: 'Trigger time', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'authorized_members', label: 'Authorized members', type: 'json', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: false },
+    { name: 'authorized_authorities', label: 'Authorized authorities', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: false },
+    { name: 'instance_trigger', label: 'Instance trigger', type: 'boolean', mandatoryType: 'external', editDefault: true, multiple: false, upsert: false, isFilterable: true },
+    { name: 'trigger_type', label: 'Trigger type', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
   ],
   relations: [],
   representative: (stix: StixTrigger) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/notifier/notifier.ts b/opencti-platform/opencti-graphql/src/modules/notifier/notifier.ts
index 800738133ec49..bbdac547296db 100644
--- a/opencti-platform/opencti-graphql/src/modules/notifier/notifier.ts
+++ b/opencti-platform/opencti-graphql/src/modules/notifier/notifier.ts
@@ -23,13 +23,13 @@ const NOTIFIER_DEFINITION: ModuleDefinition<StoreEntityNotifier, StixNotifier> =
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'built_in', type: 'boolean', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'notifier_connector_id', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'notifier_configuration', type: 'json', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'authorized_members', type: 'json', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
-    { name: 'authorized_authorities', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'built_in', label: 'Built-in', type: 'boolean', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'notifier_connector_id', label: 'Connector ID', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: false },
+    { name: 'notifier_configuration', label: 'Configuration', type: 'json', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: false },
+    { name: 'authorized_members', label: 'Authorized members', type: 'json', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: false },
+    { name: 'authorized_authorities', label: 'Authorized authorities', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: false },
   ],
   relations: [],
   representative: (stix: StixNotifier) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/organization/organization.ts b/opencti-platform/opencti-graphql/src/modules/organization/organization.ts
index 4796017850f0d..209351cd04353 100644
--- a/opencti-platform/opencti-graphql/src/modules/organization/organization.ts
+++ b/opencti-platform/opencti-graphql/src/modules/organization/organization.ts
@@ -44,19 +44,11 @@ const ORGANIZATION_DEFINITION: ModuleDefinition<StoreEntityOrganization, StixOrg
     xOpenctiAliases,
     iAliasedIds,
     xOpenctiReliability,
-    { name: 'default_dashboard', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    {
-      name: 'x_opencti_organization_type',
-      type: 'string',
-      mandatoryType: 'no',
-      editDefault: false,
-      multiple: false,
-      upsert: false,
-      label: 'Organization type'
-    },
-    { name: 'default_hidden_types', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
-    { name: 'authorized_authorities', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
-    { name: 'grantable_groups', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
+    { name: 'default_dashboard', label: 'Default dashboard', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'x_opencti_organization_type', label: 'Organization type', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'default_hidden_types', label: 'Default hidden types', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: true },
+    { name: 'authorized_authorities', label: 'Authorized authorities', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: false },
+    { name: 'grantable_groups', label: 'Grantable groups', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: true },
   ],
   relations: [
     {
diff --git a/opencti-platform/opencti-graphql/src/modules/playbook/playbook.ts b/opencti-platform/opencti-graphql/src/modules/playbook/playbook.ts
index 0fac9da822620..8ecb3c39a506e 100644
--- a/opencti-platform/opencti-graphql/src/modules/playbook/playbook.ts
+++ b/opencti-platform/opencti-graphql/src/modules/playbook/playbook.ts
@@ -38,11 +38,11 @@ const ENTITY_PLAYBOOK_DEFINITION: ModuleDefinition<StoreEntityPlaybook, StixPlay
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'description', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: false },
-    { name: 'playbook_running', type: 'boolean', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'playbook_start', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'playbook_definition', type: 'json', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, schemaDef: PlayComponentDefinition }
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: false, isFilterable: true },
+    { name: 'playbook_running', label: 'Running', type: 'boolean', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'playbook_start', label: 'Start', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'playbook_definition', label: 'Definition', type: 'json', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, schemaDef: PlayComponentDefinition, isFilterable: false }
   ],
   relations: [],
   representative: (stix: StixPlaybook) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/task/task-template/task-template.ts b/opencti-platform/opencti-graphql/src/modules/task/task-template/task-template.ts
index aeb98ca14879e..328c7ba73b250 100644
--- a/opencti-platform/opencti-graphql/src/modules/task/task-template/task-template.ts
+++ b/opencti-platform/opencti-graphql/src/modules/task/task-template/task-template.ts
@@ -28,8 +28,8 @@ const TASK_TEMPLATE_DEFINITION: ModuleDefinition<StoreEntityTaskTemplate, StixTa
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
   ],
   relations: [],
   relationsRefs: [],
diff --git a/opencti-platform/opencti-graphql/src/modules/task/task.ts b/opencti-platform/opencti-graphql/src/modules/task/task.ts
index 96cef2fd86d82..f73a557feb12d 100644
--- a/opencti-platform/opencti-graphql/src/modules/task/task.ts
+++ b/opencti-platform/opencti-graphql/src/modules/task/task.ts
@@ -29,10 +29,10 @@ const CASE_TASK_DEFINITION: ModuleDefinition<StoreEntityTask, StixTask> = {
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true },
-    { name: 'due_date', type: 'date', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, label: 'Due date' },
-    { name: 'x_opencti_workflow_id', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'due_date', label: 'Due date', type: 'date', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'x_opencti_workflow_id', label: 'Workflow status', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
   ],
   relations: [],
   relationsRefs: [
diff --git a/opencti-platform/opencti-graphql/src/modules/threatActorIndividual/threatActorIndividual.ts b/opencti-platform/opencti-graphql/src/modules/threatActorIndividual/threatActorIndividual.ts
index b41c50d2679c8..848edecc6a7b5 100644
--- a/opencti-platform/opencti-graphql/src/modules/threatActorIndividual/threatActorIndividual.ts
+++ b/opencti-platform/opencti-graphql/src/modules/threatActorIndividual/threatActorIndividual.ts
@@ -89,34 +89,26 @@ const THREAT_ACTOR_INDIVIDUAL_DEFINITION: ModuleDefinition<StoreEntityThreatActo
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'description', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true },
-    {
-      name: 'threat_actor_types',
-      type: 'string',
-      mandatoryType: 'customizable',
-      editDefault: true,
-      multiple: true,
-      upsert: false,
-      label: 'Threat actor types'
-    },
-    { name: 'first_seen', type: 'date', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, label: 'First seen' },
-    { name: 'last_seen', type: 'date', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, label: 'Last seen' },
-    { name: 'goals', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true },
-    { name: 'roles', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true },
-    { name: 'sophistication', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'resource_level', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, label: 'Resource level' },
-    { name: 'primary_motivation', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, label: 'Primary motivation' },
-    { name: 'secondary_motivations', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, label: 'Secondary motivations' },
-    { name: 'personal_motivations', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, label: 'Personal motivations' },
-    { name: 'date_of_birth', type: 'date', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'gender', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'job_title', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'marital_status', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'eye_color', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'hair_color', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'height', type: 'object', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, schemaDef: schemaMeasure },
-    { name: 'weight', type: 'object', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, schemaDef: schemaMeasure },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'threat_actor_types', label: 'Threat actor types', type: 'string', mandatoryType: 'customizable', editDefault: true, multiple: true, upsert: false, isFilterable: true },
+    { name: 'first_seen', label: 'First seen', type: 'date', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'last_seen', label: 'Last seen', type: 'date', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'goals', label: 'Goals', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, isFilterable: true },
+    { name: 'roles', label: 'Roles', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, isFilterable: true },
+    { name: 'sophistication', label: 'Sophistication', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'resource_level', label: 'Resource level', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'primary_motivation', label: 'Primary motivation', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'secondary_motivations', label: 'Secondary motivation', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, isFilterable: true },
+    { name: 'personal_motivations', label: 'Personal motivations', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: true },
+    { name: 'date_of_birth', label: 'Date of birth', type: 'date', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'gender', label: 'Gender', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'job_title', label: 'Job title', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'marital_status', label: 'Marital status', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'eye_color', label: 'Eye color', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'hair_color', label: 'Hair color', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'height', label: 'Height', type: 'object', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, schemaDef: schemaMeasure, isFilterable: false },
+    { name: 'weight', label: 'Weight', type: 'object', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, schemaDef: schemaMeasure, isFilterable: false },
   ],
   relations: [
     {
diff --git a/opencti-platform/opencti-graphql/src/modules/vocabulary/vocabulary.ts b/opencti-platform/opencti-graphql/src/modules/vocabulary/vocabulary.ts
index 719bfd9b8fbf1..6fcd6bdfae867 100644
--- a/opencti-platform/opencti-graphql/src/modules/vocabulary/vocabulary.ts
+++ b/opencti-platform/opencti-graphql/src/modules/vocabulary/vocabulary.ts
@@ -33,10 +33,10 @@ const VOCABULARY_DEFINITION: ModuleDefinition<StoreEntityVocabulary, StixVocabul
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true },
-    { name: 'category', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true },
-    { name: 'order', type: 'numeric', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'category', label: 'Category', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'order', label: 'Order', type: 'numeric', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
   ],
   relations: [],
   depsKeys: generateInputDependencyKeys(),
diff --git a/opencti-platform/opencti-graphql/src/modules/workspace/workspace.ts b/opencti-platform/opencti-graphql/src/modules/workspace/workspace.ts
index 1fe73ec45407d..7a05e60fea1f2 100644
--- a/opencti-platform/opencti-graphql/src/modules/workspace/workspace.ts
+++ b/opencti-platform/opencti-graphql/src/modules/workspace/workspace.ts
@@ -30,14 +30,14 @@ const WORKSPACE_DEFINITION: ModuleDefinition<StoreEntityWorkspace, StixWorkspace
     },
   },
   attributes: [
-    { name: 'name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: false },
-    { name: 'description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true },
-    { name: 'manifest', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'type', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false },
-    { name: 'tags', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
-    { name: 'graph_data', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false },
-    { name: 'investigated_entities_ids', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
-    { name: 'authorized_members', type: 'json', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false },
+    { name: 'name', label: 'Name', type: 'string', mandatoryType: 'external', editDefault: true, multiple: false, upsert: false, isFilterable: true },
+    { name: 'description', label: 'Description', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'manifest', label: 'Manifest', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: false },
+    { name: 'type', label: 'Type', type: 'string', mandatoryType: 'internal', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'tags', label: 'Tags', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: true },
+    { name: 'graph_data', label: 'Graph data', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
+    { name: 'investigated_entities_ids', label: 'Investigated entities IDs', type: 'string', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: false },
+    { name: 'authorized_members', label: 'Authorized members', type: 'json', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: false },
   ],
   relations: [],
   representative: (stix: StixWorkspace) => {