diff --git a/_i18n/i18n.properties b/_i18n/i18n.properties
index ce292581..ca8b77a9 100644
--- a/_i18n/i18n.properties
+++ b/_i18n/i18n.properties
@@ -28,3 +28,6 @@ Message=Message
 
 #XFLD,120: Label for a column title
 Date=Date
+
+#XFLD,120: Label for a column title
+Title=Title
diff --git a/app/incidents/annotations.cds b/app/incidents/annotations.cds
index 7b113629..3fe671d1 100644
--- a/app/incidents/annotations.cds
+++ b/app/incidents/annotations.cds
@@ -32,35 +32,36 @@ annotate service.Incidents with @(
                     Label : '{i18n>Details}',
                     ID : 'i18nDetails',
                     Target : '@UI.FieldGroup#i18nDetails',
-                },
-                {
-                    $Type : 'UI.ReferenceFacet',
-                    Label : '{i18n>Conversation}',
-                    ID : 'i18nConversation',
-                    Target : 'conversation/@UI.LineItem#i18nConversation',
                 },],
         },
+        {
+            $Type : 'UI.ReferenceFacet',
+            Label : '{i18n>Conversation}',
+            ID : 'i18nConversation',
+            Target : 'conversation/@UI.LineItem#i18nConversation',
+        },
     ],
     UI.LineItem : [
         {
             $Type : 'UI.DataField',
-            Value : title,
+            Value : ID,
+            Label : '{i18n>Title}',
         },
         {
             $Type : 'UI.DataField',
-            Value : customer.name,
             Label : '{i18n>Customer}',
+            Value : customer_ID,
         },
         {
             $Type : 'UI.DataField',
-            Value : status.descr,
             Label : '{i18n>Status}',
+            Value : status_code,
             Criticality : status.criticality,
         },
         {
             $Type : 'UI.DataField',
-            Value : urgency.descr,
             Label : '{i18n>Urgency}',
+            Value : urgency_code,
         },
     ],
 );
@@ -99,11 +100,41 @@ annotate service.Incidents with {
 annotate service.Incidents with {
     urgency @Common.Label : '{i18n>Urgency}'
 };
+annotate service.Incidents with {
+    status @Common.ValueListWithFixedValues : true
+};
+annotate service.Status with {
+    code @Common.Text : {
+        $value : descr,
+        ![@UI.TextArrangement] : #TextOnly,
+    }
+};
 annotate service.Incidents with {
     urgency @Common.ValueListWithFixedValues : true
 };
 annotate service.Urgency with {
-    code @Common.Text : descr
+    code @Common.Text : {
+        $value : descr,
+        ![@UI.TextArrangement] : #TextOnly,
+    }
+};
+annotate service.Incidents with {
+    status @Common.Text : {
+            $value : status.descr,
+            ![@UI.TextArrangement] : #TextOnly,
+        }
+};
+annotate service.Incidents with {
+    urgency @Common.Text : {
+            $value : urgency.descr,
+            ![@UI.TextArrangement] : #TextOnly,
+        }
+};
+annotate service.Incidents with {
+    customer @Common.Text : {
+            $value : customer.name,
+            ![@UI.TextArrangement] : #TextOnly,
+        }
 };
 annotate service.Incidents with @(
     UI.HeaderInfo : {
@@ -133,27 +164,9 @@ annotate service.Incidents with @(
             },],
     }
 );
-annotate service.Incidents with {
-    customer @Common.Text : {
-            $value : customer.name,
-            ![@UI.TextArrangement] : #TextOnly,
-        }
-};
 annotate service.Incidents with {
     customer @Common.ValueListWithFixedValues : false
 };
-annotate service.Incidents with {
-    status @Common.Text : status.descr
-};
-annotate service.Incidents with {
-    status @Common.ValueListWithFixedValues : true
-};
-annotate service.Status with {
-    code @Common.Text : descr
-};
-annotate service.Incidents with {
-    urgency @Common.Text : urgency.descr
-};
 annotate service.Incidents.conversation with @(
     UI.LineItem #i18nConversation : [
         {
@@ -170,3 +183,13 @@ annotate service.Incidents.conversation with @(
             Label : '{i18n>Date}',
         },]
 );
+
+annotate service.Incidents with @Common.SemanticKey: [ID]{
+    ID @Core.Computed
+};
+annotate service.Incidents with {
+    ID @Common.Text : {
+            $value : title,
+            ![@UI.TextArrangement] : #TextOnly,
+        }
+};