diff --git a/srv/extension_service_ui.cds b/srv/extension_service_ui.cds
index c7cd0e07..5348bac4 100644
--- a/srv/extension_service_ui.cds
+++ b/srv/extension_service_ui.cds
@@ -169,69 +169,25 @@ annotate OrdersService.Z_Remarks with @(
 
 // extend existing entity Orders with new extension fields and new composition
 
-@odata.draft.enabled
 annotate OrdersService.Orders with @(
 	UI: {
-		SelectionFields: [ createdAt, createdBy ],
-		LineItem: [
-			{Value: OrderNo, Label:'OrderNo'},
-			{Value: Z_Customer_ID, Label:'Customer'},                 // extension field
-			{Value: Z_SalesRegion_regionCode, Label:'Sales Region'},  // extension field
-			{Value: Z_priority,    Label:'Priority'},                 // extension field
-			{Value: createdAt,   Label:'Date'}
+		LineItem: [...,			
+			{Value: Z_Customer_ID,            Label:'Customer'},          // extension field
+			{Value: Z_SalesRegion_regionCode, Label:'Sales Region'},      // extension field
+			{Value: Z_priority,               Label:'Priority'},          // extension field		
 		],
-		HeaderInfo: {
-			TypeName: 'Order', TypeNamePlural: 'Orders',
-			Title: {
-				Label: 'Order number ', //A label is possible but it is not considered on the ObjectPage yet
-				Value: OrderNo
-			},
-			Description: {Value: createdBy}
-		},
-		Identification: [ //Is the main field group
-			{Value: createdBy, Label:'Customer'},
-			{Value: createdAt, Label:'Date'},
-			{Value: OrderNo },
-		],
-		HeaderFacets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Created}',  Target: '@UI.FieldGroup#Created'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Modified}', Target: '@UI.FieldGroup#Modified'},
-		],
-		Facets: [
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>Details}',    Target: '@UI.FieldGroup#Details'},
-			{$Type: 'UI.ReferenceFacet', Label: '{i18n>OrderItems}', Target: 'Items/@UI.LineItem'},
-			{$Type: 'UI.ReferenceFacet', Label: 'Remarks',           Target: 'Z_Remarks/@UI.LineItem'} // new composition		
+		Facets: [...,
+			{$Type: 'UI.ReferenceFacet', Label: 'Remarks', Target: 'Z_Remarks/@UI.LineItem'} // new composition		
 		],
 		FieldGroup#Details: {
-			Data: [
-				{Value: currency_code, Label:'Currency'},                  
-				{Value: Z_Customer_ID, Label:'Customer'},                 // extension field
+			Data: [...,         
+				{Value: Z_Customer_ID,            Label:'Customer'},      // extension field
 				{Value: Z_SalesRegion_regionCode, Label:'Sales Region'},  // extension field
-				{Value: Z_priority,    Label:'Priority'}                  // extension field
+				{Value: Z_priority,               Label:'Priority'}       // extension field
 			]
-		},
-		FieldGroup#Created: {
-			Data: [
-				{Value: createdBy},
-				{Value: createdAt},
-			]
-		},
-		FieldGroup#Modified: {
-			Data: [
-				{Value: modifiedBy},
-				{Value: modifiedAt},
-			]
-		},
-	},
-) 
-
-{
-	createdAt @UI.HiddenFilter:false;
-	createdBy @UI.HiddenFilter:false;
-}
-;
-
-
+		}	
+	}
+);
 
 // new field in existing service -- exchange ID with text
  annotate OrdersService.Orders with {