diff --git a/opencti-platform/opencti-front/src/components/list_lines/ListLines.jsx b/opencti-platform/opencti-front/src/components/list_lines/ListLines.jsx
index 234173ddcb4ac..464a512c24042 100644
--- a/opencti-platform/opencti-front/src/components/list_lines/ListLines.jsx
+++ b/opencti-platform/opencti-front/src/components/list_lines/ListLines.jsx
@@ -210,6 +210,7 @@ class ListLines extends Component {
       inline,
     } = this.props;
     const entityType = exportContext?.entity_type ?? this.props.entityType;
+    const exportEntityType = exportContext?.entity_type;
     const exportDisabled = numberOfElements
       && ((selectedIds.length > export_max_size
         && numberOfElements.number > export_max_size)
@@ -217,7 +218,7 @@ class ListLines extends Component {
           && numberOfElements.number > export_max_size));
     const searchContextFinal = {
       ...(searchContext ?? {}),
-      entityTypes: entityType ? [entityType] : [],
+      entityTypes: exportEntityType ? [exportEntityType] : [],
     };
     return (
       <div className={noPadding ? classes.containerNoPadding : classes.container}>
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/ExternalReferences.tsx b/opencti-platform/opencti-front/src/private/components/analyses/ExternalReferences.tsx
index 36fc02793f3da..4e6f9f6df749d 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/ExternalReferences.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/ExternalReferences.tsx
@@ -109,6 +109,7 @@ const ExternalReferences: FunctionComponent<ExternalReferencesProps> = () => {
         iconExtension={true}
         paginationOptions={queryPaginationOptions}
         numberOfElements={numberOfElements}
+        entityType={'External-Reference'}
       >
         {queryRef && (
           <React.Suspense
diff --git a/opencti-platform/opencti-front/src/private/components/analyses/Reports.tsx b/opencti-platform/opencti-front/src/private/components/analyses/Reports.tsx
index cd2d9e581db7f..1817a4a122697 100644
--- a/opencti-platform/opencti-front/src/private/components/analyses/Reports.tsx
+++ b/opencti-platform/opencti-front/src/private/components/analyses/Reports.tsx
@@ -70,7 +70,7 @@ const Reports: FunctionComponent = () => {
     const isRuntimeSort = isRuntimeFieldEnable() ?? false;
     const dataColumns = {
       name: {
-        label: 'Title',
+        label: 'Name',
         width: '25%',
         isSortable: true,
       },
diff --git a/opencti-platform/opencti-front/src/private/components/cases/tasks/TasksLine.tsx b/opencti-platform/opencti-front/src/private/components/cases/tasks/TasksLine.tsx
index bbc4f33635bf4..8a94ac2cc1140 100644
--- a/opencti-platform/opencti-front/src/private/components/cases/tasks/TasksLine.tsx
+++ b/opencti-platform/opencti-front/src/private/components/cases/tasks/TasksLine.tsx
@@ -88,7 +88,7 @@ const TaskFragment = graphql`
 
 export const tasksDataColumns: DataColumns = {
   name: {
-    label: 'Title',
+    label: 'Name',
     width: '35%',
     isSortable: true,
     render: (task: TasksLine_node$data) => (
diff --git a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectAttackPatternsKillChain.jsx b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectAttackPatternsKillChain.jsx
index 32f75dddecfa2..abf174147f62c 100644
--- a/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectAttackPatternsKillChain.jsx
+++ b/opencti-platform/opencti-front/src/private/components/common/stix_domain_objects/StixDomainObjectAttackPatternsKillChain.jsx
@@ -135,10 +135,10 @@ class StixDomainObjectAttackPatternsKillChainComponent extends Component {
           >
             <Tooltip
               title={
-                                currentModeOnlyActive
-                                  ? t('Display the whole matrix')
-                                  : t('Display only used techniques')
-                            }
+                currentModeOnlyActive
+                  ? t('Display the whole matrix')
+                  : t('Display only used techniques')
+              }
             >
               <span>
                 <IconButton
diff --git a/opencti-platform/opencti-front/src/private/components/settings/Notifiers.tsx b/opencti-platform/opencti-front/src/private/components/settings/Notifiers.tsx
index 8d42251765036..465815ae7bc39 100644
--- a/opencti-platform/opencti-front/src/private/components/settings/Notifiers.tsx
+++ b/opencti-platform/opencti-front/src/private/components/settings/Notifiers.tsx
@@ -51,12 +51,12 @@ const Notifiers = () => {
       isSortable: true,
     },
     name: {
-      label: 'name',
+      label: 'Name',
       width: '20%',
       isSortable: true,
     },
     description: {
-      label: 'description',
+      label: 'Description',
       width: '60%',
       isSortable: false,
     },
diff --git a/opencti-platform/opencti-graphql/src/domain/filterKeysSchema.ts b/opencti-platform/opencti-graphql/src/domain/filterKeysSchema.ts
index 84ba848db5fc1..5d0b52c9c29d2 100644
--- a/opencti-platform/opencti-graphql/src/domain/filterKeysSchema.ts
+++ b/opencti-platform/opencti-graphql/src/domain/filterKeysSchema.ts
@@ -12,7 +12,8 @@ import type {
 } from '../schema/attribute-definition';
 import { schemaRelationsRefDefinition } from '../schema/schema-relationsRef';
 import { isStixCoreObject } from '../schema/stixCoreObject';
-import { SOURCE_RELIABILITY_FILTER, WORKFLOW_FILTER } from '../utils/filtering/filtering-constants';
+import { SOURCE_RELIABILITY_FILTER, TYPE_FILTER, WORKFLOW_FILTER } from '../utils/filtering/filtering-constants';
+import { isAbstract } from '../schema/general';
 
 type FilterDefinition = {
   filterKey: string
@@ -160,33 +161,46 @@ const completeFilterDefinitionMapForType = (
 };
 
 const completeFilterDefinitionMapWithStixCoreObjectsSpecialKeys = (
+  type: string,
   filterDefinitionsMap: Map<string, FilterDefinition>, // filter definition map to complete
   subEntityTypes: string[],
 ) => {
-  filterDefinitionsMap.set('regardingOf', {
-    filterKey: 'regardingOf',
-    type: 'nested',
-    label: 'In regards of',
-    multiple: true,
-    subEntityTypes,
-    elementsForFilterValuesSearch: [],
-  });
-  filterDefinitionsMap.set(SOURCE_RELIABILITY_FILTER, {
-    filterKey: SOURCE_RELIABILITY_FILTER,
-    type: 'vocabulary',
-    label: 'Reliability of author',
-    multiple: false,
-    subEntityTypes,
-    elementsForFilterValuesSearch: ['reliability_ov'],
-  });
-  filterDefinitionsMap.set(WORKFLOW_FILTER, {
-    filterKey: WORKFLOW_FILTER,
-    type: 'special',
-    label: 'Workflow status',
-    multiple: false,
-    subEntityTypes,
-    elementsForFilterValuesSearch: [],
-  });
+  if (isStixCoreObject(type)) {
+    filterDefinitionsMap.set('regardingOf', {
+      filterKey: 'regardingOf',
+      type: 'nested',
+      label: 'In regards of',
+      multiple: true,
+      subEntityTypes,
+      elementsForFilterValuesSearch: [],
+    });
+    filterDefinitionsMap.set(SOURCE_RELIABILITY_FILTER, {
+      filterKey: SOURCE_RELIABILITY_FILTER,
+      type: 'vocabulary',
+      label: 'Reliability of author',
+      multiple: false,
+      subEntityTypes,
+      elementsForFilterValuesSearch: ['reliability_ov'],
+    });
+    filterDefinitionsMap.set(WORKFLOW_FILTER, {
+      filterKey: WORKFLOW_FILTER,
+      type: 'special',
+      label: 'Workflow status',
+      multiple: false,
+      subEntityTypes,
+      elementsForFilterValuesSearch: [],
+    });
+    if (isAbstract(type)) {
+      filterDefinitionsMap.set(TYPE_FILTER, {
+        filterKey: TYPE_FILTER,
+        type: 'string',
+        label: 'Entity type',
+        multiple: false,
+        subEntityTypes,
+        elementsForFilterValuesSearch: [],
+      });
+    }
+  }
 };
 
 export const generateFilterKeysSchema = () => {
@@ -197,9 +211,7 @@ export const generateFilterKeysSchema = () => {
     // 01. add attributes and relations refs of type
     completeFilterDefinitionMapForType(filterDefinitionsMap, type);
     // 02. for stix-core-objects, also add some special keys
-    if (isStixCoreObject(type)) {
-      completeFilterDefinitionMapWithStixCoreObjectsSpecialKeys(filterDefinitionsMap, subTypes.concat([type]));
-    }
+    completeFilterDefinitionMapWithStixCoreObjectsSpecialKeys(type, filterDefinitionsMap, subTypes.concat([type]));
     // 03. handle the attributes and relations refs of the subtypes
     if (subTypes.length > 0) {
       subTypes.forEach((subType) => completeFilterDefinitionMapForType(filterDefinitionsMap, subType));
diff --git a/opencti-platform/opencti-graphql/src/modules/attributes/basicRelationship-registrationAttributes.ts b/opencti-platform/opencti-graphql/src/modules/attributes/basicRelationship-registrationAttributes.ts
index 4e0d03396eca8..94af4c84ee6f7 100644
--- a/opencti-platform/opencti-graphql/src/modules/attributes/basicRelationship-registrationAttributes.ts
+++ b/opencti-platform/opencti-graphql/src/modules/attributes/basicRelationship-registrationAttributes.ts
@@ -21,12 +21,12 @@ const basicRelationshipAttributes: Array<AttributeDefinition> = [
   standardId,
   parentTypes,
   baseType,
-  relationshipType,
+  { ...relationshipType, isFilterable: false },
   entityType,
   createdAt,
   updatedAt,
   creators,
-  { name: 'i_inference_weight', label: 'Inference weight', type: 'numeric', precision: 'integer', editDefault: false, mandatoryType: 'no', multiple: false, upsert: false, isFilterable: true },
+  { name: 'i_inference_weight', label: 'Inference weight', type: 'numeric', precision: 'integer', editDefault: false, mandatoryType: 'no', multiple: false, upsert: false, isFilterable: false },
   {
     name: 'connections',
     label: 'Relations connections',
diff --git a/opencti-platform/opencti-graphql/src/modules/attributes/stixCoreRelationship-registrationAttributes.ts b/opencti-platform/opencti-graphql/src/modules/attributes/stixCoreRelationship-registrationAttributes.ts
index affb039a92d43..2e4c2969abc68 100644
--- a/opencti-platform/opencti-graphql/src/modules/attributes/stixCoreRelationship-registrationAttributes.ts
+++ b/opencti-platform/opencti-graphql/src/modules/attributes/stixCoreRelationship-registrationAttributes.ts
@@ -7,7 +7,7 @@ export const stixCoreRelationshipsAttributes: Array<AttributeDefinition> = [
   { name: 'start_time', label: 'First observation', type: 'date', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
   { name: 'stop_time', label: 'Last observation', type: 'date', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
   { name: 'description', label: 'Description', type: 'string', format: 'text', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
-  { name: 'x_opencti_workflow_id', label: 'Workflow status', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: false },
+  { name: 'x_opencti_workflow_id', label: 'Status', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: false },
 ];
 schemaAttributesDefinition.registerAttributes(ABSTRACT_STIX_CORE_RELATIONSHIP, stixCoreRelationshipsAttributes);
 STIX_CORE_RELATIONSHIPS.map((type) => schemaAttributesDefinition.registerAttributes(type, stixCoreRelationshipsAttributes));
diff --git a/opencti-platform/opencti-graphql/src/modules/attributes/stixCyberObservable-registrationAttributes.ts b/opencti-platform/opencti-graphql/src/modules/attributes/stixCyberObservable-registrationAttributes.ts
index 7402d4154599f..f88a047f95929 100644
--- a/opencti-platform/opencti-graphql/src/modules/attributes/stixCyberObservable-registrationAttributes.ts
+++ b/opencti-platform/opencti-graphql/src/modules/attributes/stixCyberObservable-registrationAttributes.ts
@@ -52,8 +52,8 @@ const hashDefinition: AttributeDefinition = {
     { name: 'SHA-1', label: 'SHA-1', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
     { name: 'SHA-256', label: 'SHA-256', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
     { name: 'SHA-512', label: 'SHA-512', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
-    { name: 'SHA3-256', label: 'SHA3-256', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
-    { name: 'SHA3-512', label: 'SHA3-512', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'SHA3-256', label: 'SHA3-256', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false },
+    { name: 'SHA3-512', label: 'SHA3-512', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false },
     { name: 'SSDEEP', label: 'SSDEEP', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
     { name: 'SDHASH', label: 'SDHASH', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
     { name: 'TLSH', label: 'TLSH', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
@@ -181,7 +181,7 @@ const stixCyberObservablesAttributes: { [k: string]: Array<AttributeDefinition>
     { name: 'extensions', label: 'Extensions', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
     { name: 'is_hidden', label: 'Hidden', type: 'boolean', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
     { name: 'pid', label: 'PID', type: 'numeric', precision: 'long', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
-    { name: 'created_time', label: 'Creation date', type: 'date', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'created_time', label: 'Process creation date', type: 'date', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
     { name: 'cwd', label: 'CWD', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
     { name: 'command_line', label: 'Command line', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
     { name: 'environment_variables', label: 'Environment variables', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: true, upsert: true, isFilterable: true },
diff --git a/opencti-platform/opencti-graphql/src/modules/attributes/stixDomainObject-registrationAttributes.ts b/opencti-platform/opencti-graphql/src/modules/attributes/stixDomainObject-registrationAttributes.ts
index 17bae4aba06d1..6654e0e9e0416 100644
--- a/opencti-platform/opencti-graphql/src/modules/attributes/stixDomainObject-registrationAttributes.ts
+++ b/opencti-platform/opencti-graphql/src/modules/attributes/stixDomainObject-registrationAttributes.ts
@@ -44,8 +44,8 @@ const stixDomainObjectAttributes: Array<AttributeDefinition> = [
   confidence,
   revoked,
   { ...files, update: true },
-  { name: 'x_opencti_graph_data', label: 'Graph data', type: 'string', format: 'text', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: true },
-  { name: 'x_opencti_workflow_id', label: 'Workflow status', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false }
+  { name: 'x_opencti_graph_data', label: 'Graph data', type: 'string', format: 'text', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: false },
+  { name: 'x_opencti_workflow_id', label: 'Status', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false }
 ];
 schemaAttributesDefinition.registerAttributes(ABSTRACT_STIX_DOMAIN_OBJECT, stixDomainObjectAttributes);
 
@@ -95,21 +95,21 @@ const stixDomainObjectsAttributes: { [k: string]: Array<AttributeDefinition> } =
     { name: 'authors', label: 'Authors', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: true },
     { name: 'note_types', label: 'Note types', type: 'string', format: 'vocabulary', vocabularyCategory: 'note_types_ov', mandatoryType: 'customizable', editDefault: true, multiple: true, upsert: true, isFilterable: true },
     { name: 'likelihood', label: 'Likelihood', type: 'numeric', precision: 'integer', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
-    { name: 'content_mapping', label: 'Content mapping', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'content_mapping', label: 'Content mapping', type: 'string', format: 'text', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false },
   ],
   [ENTITY_TYPE_CONTAINER_OBSERVED_DATA]: [
     { name: 'first_observed', label: 'First observed', type: 'date', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'last_observed', label: 'Last observed', type: 'date', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'number_observed', label: 'Number observed', type: 'numeric', precision: 'integer', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'content', label: 'Content', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
-    { name: 'content_mapping', label: 'Content mapping', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'content_mapping', label: 'Content mapping', type: 'string', format: 'text', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false },
   ],
   [ENTITY_TYPE_CONTAINER_OPINION]: [
     { name: 'explanation', label: 'Explanation', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'authors', label: 'Authors', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: true, upsert: false, isFilterable: true },
     { name: 'opinion', label: 'Opinion', type: 'string', format: 'vocabulary', vocabularyCategory: 'opinion_ov', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'content', label: 'Content', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
-    { name: 'content_mapping', label: 'Content mapping', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'content_mapping', label: 'Content mapping', type: 'string', format: 'text', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false },
   ],
   [ENTITY_TYPE_CONTAINER_REPORT]: [
     { name: 'name', label: 'Name', type: 'string', format: 'short', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
@@ -118,7 +118,7 @@ const stixDomainObjectsAttributes: { [k: string]: Array<AttributeDefinition> } =
     xOpenctiReliability,
     { name: 'published', label: 'Publication date', type: 'date', mandatoryType: 'external', editDefault: true, multiple: false, upsert: false, isFilterable: true },
     { name: 'content', label: 'Content', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
-    { name: 'content_mapping', label: 'Content mapping', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'content_mapping', label: 'Content mapping', type: 'string', format: 'text', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false },
   ],
   [ENTITY_TYPE_COURSE_OF_ACTION]: [
     xOpenctiAliases,
@@ -244,7 +244,7 @@ const stixDomainObjectsAttributes: { [k: string]: Array<AttributeDefinition> } =
     { name: 'source', label: 'Source', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, 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: 'objective', label: 'Obective', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'objective', label: 'Objective', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
   ],
 };
 R.forEachObjIndexed((value, key) => schemaAttributesDefinition.registerAttributes(key as string, value), stixDomainObjectsAttributes);
diff --git a/opencti-platform/opencti-graphql/src/modules/attributes/stixSightingRelationship-registrationAttributes.ts b/opencti-platform/opencti-graphql/src/modules/attributes/stixSightingRelationship-registrationAttributes.ts
index f2b8f404a169b..3cb7c4e9e5bd1 100644
--- a/opencti-platform/opencti-graphql/src/modules/attributes/stixSightingRelationship-registrationAttributes.ts
+++ b/opencti-platform/opencti-graphql/src/modules/attributes/stixSightingRelationship-registrationAttributes.ts
@@ -10,7 +10,7 @@ export const stixSightingRelationshipsAttributes: { [k: string]: Array<Attribute
     { name: 'last_seen', label: 'Last seen', type: 'date', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'description', label: 'Description', type: 'string', format: 'text', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'x_opencti_negative', label: 'False positive', type: 'boolean', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: false, isFilterable: true },
-    { name: 'x_opencti_workflow_id', label: 'Workflow status', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: false },
+    { name: 'x_opencti_workflow_id', label: 'Status', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: false, isFilterable: false },
   ],
 };
 R.forEachObjIndexed((value, key) => schemaAttributesDefinition.registerAttributes(key as string, value), stixSightingRelationshipsAttributes);
diff --git a/opencti-platform/opencti-graphql/src/modules/case/case.ts b/opencti-platform/opencti-graphql/src/modules/case/case.ts
index 3f64109d7a07d..9f3cb7379494f 100644
--- a/opencti-platform/opencti-graphql/src/modules/case/case.ts
+++ b/opencti-platform/opencti-graphql/src/modules/case/case.ts
@@ -27,7 +27,7 @@ const CASE_DEFINITION: ModuleDefinition<StoreEntityCase, StixCase> = {
     { name: 'name', label: 'Name', type: 'string', format: 'short', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'description', label: 'Description', type: 'string', format: 'text', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'content', label: 'Content', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
-    { name: 'content_mapping', label: 'Content mapping', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
+    { name: 'content_mapping', label: 'Content mapping', type: 'string', format: 'text', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false },
     { name: 'caseTemplate', label: 'Case template', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
   ],
   relations: [],
diff --git a/opencti-platform/opencti-graphql/src/modules/grouping/grouping.ts b/opencti-platform/opencti-graphql/src/modules/grouping/grouping.ts
index 086033057e856..51a94f79e9649 100644
--- a/opencti-platform/opencti-graphql/src/modules/grouping/grouping.ts
+++ b/opencti-platform/opencti-graphql/src/modules/grouping/grouping.ts
@@ -25,8 +25,8 @@ const GROUPING_DEFINITION: ModuleDefinition<StoreEntityGrouping, StixGrouping> =
     { name: 'name', label: 'Name', type: 'string', format: 'short', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'description', label: 'Description', type: 'string', format: 'text', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'content', label: 'Content', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
-    { name: 'content_mapping', label: 'Content mapping', format: 'short', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: true },
-    { name: 'context', label: 'Content', type: 'string', format: 'vocabulary', vocabularyCategory: 'grouping_context_ov', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'content_mapping', label: 'Content mapping', format: 'text', type: 'string', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false },
+    { name: 'context', label: 'Context', type: 'string', format: 'vocabulary', vocabularyCategory: 'grouping_context_ov', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
   ],
   relations: [],
   representative: (stix: StixGrouping) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/indicator/indicator.ts b/opencti-platform/opencti-graphql/src/modules/indicator/indicator.ts
index 494d78edbd6d7..00a70c8007cc1 100644
--- a/opencti-platform/opencti-graphql/src/modules/indicator/indicator.ts
+++ b/opencti-platform/opencti-graphql/src/modules/indicator/indicator.ts
@@ -3,6 +3,7 @@ import { ABSTRACT_STIX_DOMAIN_OBJECT } from '../../schema/general';
 import { ENTITY_TYPE_INDICATOR, type StixIndicator, type StoreEntityIndicator } from './indicator-types';
 import convertIndicatorToStix from './indicator-converter';
 import { killChainPhases, objectOrganization } from '../../schema/stixRefRelationship';
+import { revoked } from '../../schema/attribute-definition';
 
 const INDICATOR_DEFINITION: ModuleDefinition<StoreEntityIndicator, StixIndicator> = {
   type: {
@@ -83,6 +84,7 @@ const INDICATOR_DEFINITION: ModuleDefinition<StoreEntityIndicator, StixIndicator
       isFilterable: false,
       format: 'flat'
     },
+    { ...revoked, isFilterable: true },
   ],
   relations: [],
   relationsRefs: [objectOrganization, killChainPhases],
diff --git a/opencti-platform/opencti-graphql/src/modules/malwareAnalysis/malwareAnalysis.ts b/opencti-platform/opencti-graphql/src/modules/malwareAnalysis/malwareAnalysis.ts
index b6eef038df6d1..717c2516639cb 100644
--- a/opencti-platform/opencti-graphql/src/modules/malwareAnalysis/malwareAnalysis.ts
+++ b/opencti-platform/opencti-graphql/src/modules/malwareAnalysis/malwareAnalysis.ts
@@ -49,7 +49,7 @@ export const MALWARE_ANALYSIS_DEFINITION: ModuleDefinition<StoreEntityMalwareAna
   },
   attributes: [
     { name: 'product', label: 'Product', type: 'string', format: 'short', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
-    { name: 'version', label: 'Version', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'version', label: 'Product version', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'configuration_version', label: 'Configuration version', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'modules', label: 'Modules', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: true, upsert: true, isFilterable: true },
     { name: 'analysis_engine_version', label: 'Analysis engine version', type: 'string', format: 'short', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
@@ -57,8 +57,8 @@ export const MALWARE_ANALYSIS_DEFINITION: ModuleDefinition<StoreEntityMalwareAna
     { 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', format: 'short', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
-    { name: 'result', label: 'Result', type: 'string', format: 'vocabulary', vocabularyCategory: 'malware_result_ov', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { name: 'result_name', label: 'Result name', type: 'string', format: 'short', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: false },
+    { name: 'result', label: 'Maliciousness', type: 'string', format: 'vocabulary', vocabularyCategory: 'malware_result_ov', mandatoryType: 'customizable', editDefault: true, multiple: false, upsert: true, isFilterable: true },
   ],
   converter: convertMalwareAnalysisToStix,
   representative: (stix: StixMalwareAnalysis) => {
diff --git a/opencti-platform/opencti-graphql/src/modules/task/task.ts b/opencti-platform/opencti-graphql/src/modules/task/task.ts
index 3d2594d4b9900..7636f39837c42 100644
--- a/opencti-platform/opencti-graphql/src/modules/task/task.ts
+++ b/opencti-platform/opencti-graphql/src/modules/task/task.ts
@@ -26,7 +26,7 @@ const CASE_TASK_DEFINITION: ModuleDefinition<StoreEntityTask, StixTask> = {
     { name: 'name', label: 'Name', type: 'string', format: 'short', mandatoryType: 'external', editDefault: true, multiple: false, upsert: true, isFilterable: true },
     { name: 'description', label: 'Description', type: 'string', format: 'text', 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', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false },
+    { name: 'x_opencti_workflow_id', label: 'Status', type: 'string', format: 'short', mandatoryType: 'no', editDefault: false, multiple: false, upsert: true, isFilterable: false },
   ],
   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 01992f58bbc8c..c20cd7d4a5e4e 100644
--- a/opencti-platform/opencti-graphql/src/modules/threatActorIndividual/threatActorIndividual.ts
+++ b/opencti-platform/opencti-graphql/src/modules/threatActorIndividual/threatActorIndividual.ts
@@ -46,6 +46,7 @@ import { ENTITY_TYPE_EVENT } from '../event/event-types';
 import { ENTITY_HASHED_OBSERVABLE_STIX_FILE } from '../../schema/stixCyberObservable';
 import { ENTITY_TYPE_LOCATION_ADMINISTRATIVE_AREA } from '../administrativeArea/administrativeArea-types';
 import { ENTITY_TYPE_IDENTITY_ORGANIZATION } from '../organization/organization-types';
+import { lang, revoked } from '../../schema/attribute-definition';
 
 interface Measures {
   measure: number | null
@@ -132,8 +133,8 @@ const THREAT_ACTOR_INDIVIDUAL_DEFINITION: ModuleDefinition<StoreEntityThreatActo
       ]
     },
     { name: 'confidence', label: 'Confidence', type: 'numeric', precision: 'integer', mandatoryType: 'no', editDefault: true, multiple: false, upsert: false, isFilterable: true },
-    { name: 'revoked', label: 'Revoked', type: 'boolean', mandatoryType: 'no', editDefault: true, multiple: false, upsert: false, isFilterable: true },
-    { name: 'lang', label: 'Lang', type: 'string', format: 'short', mandatoryType: 'no', editDefault: true, multiple: false, upsert: true, isFilterable: true },
+    { ...revoked, editDefault: true, upsert: false, isFilterable: true },
+    { ...lang, editDefault: true, upsert: true },
   ],
   relations: [
     {
diff --git a/opencti-platform/opencti-graphql/src/schema/attribute-definition.ts b/opencti-platform/opencti-graphql/src/schema/attribute-definition.ts
index 9b52e1d955332..4ffd1dd50a229 100644
--- a/opencti-platform/opencti-graphql/src/schema/attribute-definition.ts
+++ b/opencti-platform/opencti-graphql/src/schema/attribute-definition.ts
@@ -125,7 +125,7 @@ export const iAliasedIds: AttributeDefinition = {
   editDefault: false,
   multiple: true,
   upsert: false,
-  isFilterable: true,
+  isFilterable: false,
 };
 
 export const files: AttributeDefinition = {
@@ -215,7 +215,7 @@ export const entityType: AttributeDefinition = {
   editDefault: false,
   multiple: false,
   upsert: false,
-  isFilterable: true,
+  isFilterable: false, // added in filterKeysSchema as filterable only for abstract types
 };
 
 export const entityLocationType: AttributeDefinition = {
@@ -367,7 +367,7 @@ export const revoked: AttributeDefinition = {
   editDefault: false,
   multiple: false,
   upsert: true,
-  isFilterable: true,
+  isFilterable: false,
 };
 
 export const confidence: AttributeDefinition = {
@@ -405,7 +405,7 @@ export const lang: AttributeDefinition = {
   editDefault: false,
   multiple: false,
   upsert: false,
-  isFilterable: true,
+  isFilterable: false,
 };
 
 export const identityClass: AttributeDefinition = {
diff --git a/opencti-platform/opencti-graphql/src/schema/stixRefRelationship.ts b/opencti-platform/opencti-graphql/src/schema/stixRefRelationship.ts
index 6eb59d4948f06..38f34a9f14383 100644
--- a/opencti-platform/opencti-graphql/src/schema/stixRefRelationship.ts
+++ b/opencti-platform/opencti-graphql/src/schema/stixRefRelationship.ts
@@ -476,7 +476,7 @@ export const creatorUser: RefAttribute = {
   name: INPUT_CREATOR_USER,
   type: 'ref',
   databaseName: RELATION_CREATOR_USER,
-  label: 'User creator',
+  label: 'User account creator',
   stixName: 'creator_user_ref',
   mandatoryType: 'no',
   editDefault: false,
@@ -588,7 +588,7 @@ export const xOpenctiLinkedTo: RefAttribute = {
     return this.toTypes.includes(toType);
   },
   datable: true,
-  isFilterable: true,
+  isFilterable: false,
   toTypes: ['Stix-Core-Object'],
 };
 export const serviceDlls: RefAttribute = {
@@ -716,7 +716,7 @@ export const objectOrganization: RefAttribute = {
   name: INPUT_GRANTED_REFS,
   type: 'ref',
   databaseName: RELATION_GRANTED_TO,
-  label: 'Granted by',
+  label: 'Shared with',
   stixName: 'granted_refs',
   mandatoryType: 'no',
   editDefault: false,