diff --git a/README.md b/README.md
index b652330c..29311a48 100644
--- a/README.md
+++ b/README.md
@@ -90,9 +90,10 @@ User Interface related Features:
 - [Model Localization](https://cap.cloud.sap/docs/guides/i18n) for [English](app/_i18n/i18n.properties) and [German](app/_i18n/i18n_de.properties) language for static texts
 - [Custom File Upload extension](app/admin/webapp/extension/Upload.js) which provides a button for uploading `CSV` files
 - A simple Swagger UI for the CatalogService API at <http://localhost:8080/swagger/index.html>
-- UI5 [Tree Table](app/genres/webapp/manifest.json) with Value Help for [GenreHierarchy](app/admin/fiori-service.cds)
+- UI5 [Tree Table](app/genres/webapp/manifest.json) with CRUD requests and Value Help for [GenreHierarchy](app/admin/fiori-service.cds). Only on HANA. To check tree table `Contents` embedded into `Books`, please remove `@UI.Hidden` annotation from [Fiori Service](app/admin/fiori-service.cds)
 - [Custom event handlers](https://cap.cloud.sap/docs/java/provisioning-api) for Tree Table such as the [Custom business logic for GenreHierarchy](srv/src/main/java/my/bookshop/handlers/HierarchyHandler.java).
   Please note, that Tree Tables must be used with HANA. Custom event handler in this case provides a limited support ment for local testing.
+- [Custom actions](https://cap.cloud.sap/docs/cds/cdl#actions) such as `moveSibling` in the [Admin Service](srv/admin-service.cds). This action demonstrates experimental UI feature [ChangeNextSiblingAction](https://github.com/SAP/odata-vocabularies/blob/main/vocabularies/Hierarchy.md#template_changenextsiblingaction-experimental). The Action implementation is in the [Hierarchy Sibling Action Handler](srv/src/main/java/my/bookshop/handlers/HierarchySiblingActionHandler.java)
 
 CDS Maven Plugin Features:
 
diff --git a/app/_i18n/i18n.properties b/app/_i18n/i18n.properties
index a12b718d..94df904d 100644
--- a/app/_i18n/i18n.properties
+++ b/app/_i18n/i18n.properties
@@ -5,6 +5,7 @@ Created = Created
 Modified = Modified
 ModifiedBy = Modified By
 General = General
+Contents = Contents
 Details = Details
 Admin = Administrative
 Translations = Translations
@@ -63,7 +64,11 @@ Text = Text
 Image = Image
 Genres = Genres
 Genre = Genre
-
+PageNumber = Page Number
+Informations = Informations
+Page = Page
+ContentsLevel = Contents Level
+ContentsLevels = Contents Levels
 AddReview = Add Review
 
 Notes = Notes
diff --git a/app/_i18n/i18n_de.properties b/app/_i18n/i18n_de.properties
index 63c111fb..a134ff55 100644
--- a/app/_i18n/i18n_de.properties
+++ b/app/_i18n/i18n_de.properties
@@ -5,6 +5,7 @@ Created = Angelegt
 Modified = Bearbeitet
 ModifiedBy = Bearbeitet von
 General = Generelles
+Contents = Buchinhalt
 Details = Details
 Admin = Administratives
 Translations = Übersetzungen
@@ -63,6 +64,11 @@ Text = Text
 Image = Bild
 Genres = Genre
 Genre = Genre
+PageNumber = Seitenzahl 
+Informations = Informationen
+Page = Seite
+ContentsLevel = Inhaltsebene
+ContentsLevels = Inhaltsebenen
 
 AddReview = Rezension hinzufügen
 
diff --git a/app/admin/fiori-service.cds b/app/admin/fiori-service.cds
index c848916b..813afea9 100644
--- a/app/admin/fiori-service.cds
+++ b/app/admin/fiori-service.cds
@@ -36,6 +36,13 @@ annotate AdminService.Books with @(UI : {
             $Type : 'UI.ReferenceFacet',
             Label : '{i18n>Admin}',
             Target : '@UI.FieldGroup#Admin'
+        },
+        {   
+            // TODO: should work dynamically
+            @UI.Hidden,
+            $Type  : 'UI.ReferenceFacet',
+            Label  : '{i18n>Contents}',
+            Target : 'contents/@UI.PresentationVariant'
         }
     ],
     FieldGroup #General : {Data : [
@@ -60,10 +67,14 @@ annotate AdminService.Books with @(UI : {
     ]}
 });
 
-// Add Value Help for Tree Table
+
+////////////////////////////////////////////////////////////////////////////
+//
+//	Value Help for Tree Table
+//
 annotate AdminService.Books with {
     genre @(Common: {
-        Label    : 'Genre',
+        Label    : '{i18n>Genre}',
         ValueList: {
             CollectionPath              : 'GenreHierarchy',
             Parameters                  : [
@@ -87,6 +98,12 @@ annotate AdminService.GenreHierarchy with {
   ID @UI.Hidden;
 };
 
+@Hierarchy.RecursiveHierarchyActions #GenreHierarchy: {
+  $Type                  : 'Hierarchy.RecursiveHierarchyActionsType',
+  // any name can be the action name with namespace/no bound action name
+  ChangeNextSiblingAction: 'AdminService.moveSibling',
+}
+
 annotate AdminService.GenreHierarchy with @UI: {
     PresentationVariant #VH: {
         $Type                      : 'UI.PresentationVariantType',
@@ -96,7 +113,48 @@ annotate AdminService.GenreHierarchy with @UI: {
     LineItem               : [{
         $Type: 'UI.DataField',
         Value: name,
-    }]
+        Label : '{i18n>Genre}'
+    }],
+};
+
+annotate AdminService.ContentsHierarchy with @UI: {
+    PresentationVariant  : {
+        $Type         : 'UI.PresentationVariantType',
+        RequestAtLeast: [name],
+        Visualizations: ['@UI.LineItem'],
+    },
+    LineItem             : [{
+        $Type: 'UI.DataField',
+        Value: name,
+        Label : '{i18n>Name}'
+        },
+        {
+        $Type: 'UI.DataField',
+        Value: page,
+        Label : '{i18n>Page}'
+    }],
+    HeaderInfo            : {
+        $Type         : 'UI.HeaderInfoType',
+        TypeName      : '{i18n>ContentsLevel}',
+        TypeNamePlural: '{i18n>ContentsLevels}',
+        Title         : {
+            $Type: 'UI.DataField',
+            Value: name,
+        }
+    },
+    FieldGroup : {
+        $Type: 'UI.FieldGroupType',
+        Data : [{
+            $Type: 'UI.DataField',
+            Value: page,
+            Label : '{i18n>PageNumber}'
+        }],
+    },
+    Facets                 : [{
+        $Type : 'UI.ReferenceFacet',
+        Target: '@UI.FieldGroup',
+        Label : '{i18n>Informations}',
+    }],
 };
 
 ////////////////////////////////////////////////////////////
@@ -138,6 +196,26 @@ annotate AdminService.Books.texts {
     }
 }
 
+////////////////////////////////////////////////////////////
+//
+//  Annotations for hierarchy ContentsHierarchy
+//
+annotate AdminService.ContentsHierarchy with @Aggregation.RecursiveHierarchy#ContentsHierarchy: {
+    $Type: 'Aggregation.RecursiveHierarchyType',
+    NodeProperty: ID, // identifies a node
+    ParentNavigationProperty: parent // navigates to a node's parent
+  };
+
+annotate AdminService.ContentsHierarchy with @Hierarchy.RecursiveHierarchy#ContentsHierarchy: {
+  $Type: 'Hierarchy.RecursiveHierarchyType',
+  LimitedDescendantCount: LimitedDescendantCount,
+  DistanceFromRoot: DistanceFromRoot,
+  DrillState: DrillState,
+  Matched: Matched,
+  MatchedDescendantCount: MatchedDescendantCount,
+  LimitedRank: LimitedRank
+};
+
 annotate AdminService.Books actions {
     @(
         Common.SideEffects : {
diff --git a/app/admin/webapp/manifest.json b/app/admin/webapp/manifest.json
index 29ac7e46..49d05c2c 100644
--- a/app/admin/webapp/manifest.json
+++ b/app/admin/webapp/manifest.json
@@ -51,7 +51,7 @@
                 "settings": {
                     "synchronizationMode": "None",
                     "operationMode": "Server",
-                    "autoExpandSelect" : true,
+                    "autoExpandSelect": true,
                     "earlyRequests": true,
                     "groupProperties": {
                         "default": {
@@ -74,9 +74,9 @@
                     "target": "BooksDetails"
                 },
                 {
-                    "pattern": "Books({key}/author({key2}):?query:",
-                    "name": "AuthorsDetails",
-                    "target": "AuthorsDetails"
+                    "pattern": "Books({key})/contents({key2}):?query:",
+                    "name": "ContentsDetails",
+                    "target": "ContentsDetails"
                 }
             ],
             "targets": {
@@ -115,22 +115,30 @@
                         "settings" : {
                             "contextPath" : "/Books",
                             "navigation" : {
-                                "Authors" : {
-                                    "detail" : {
-                                        "route" : "AuthorsDetails"
+                                "contents": {
+                                    "detail": {
+                                        "route": "ContentsDetails"
+                                    }
+                                }
+                            },
+                            "controlConfiguration": {
+                                "contents/@com.sap.vocabularies.UI.v1.LineItem": {
+                                    "tableSettings": {
+                                        "hierarchyQualifier": "ContentsHierarchy",
+                                        "type": "TreeTable"
                                     }
                                 }
                             }
                         }
                     }
                 },
-                "AuthorsDetails": {
+                "ContentsDetails": {
                     "type": "Component",
-                    "id": "AuthorsDetailsList",
+                    "id": "ContentsDetails",
                     "name": "sap.fe.templates.ObjectPage",
                     "options": {
-                        "settings" : {
-                            "contextPath" : "/Authors"
+                        "settings": {
+                            "contextPath": "/Books/contents"
                         }
                     }
                 }
diff --git a/app/appconfig/fioriSandboxConfig.json b/app/appconfig/fioriSandboxConfig.json
index 48b2ef6a..5c030843 100644
--- a/app/appconfig/fioriSandboxConfig.json
+++ b/app/appconfig/fioriSandboxConfig.json
@@ -20,7 +20,8 @@
                     "title": "Browse Books",
                     "description": "Find your favorite book"
                   }
-                },                {
+                },                
+                {
                   "id": "browse-genres",
                   "tileType": "sap.ushell.ui.tile.StaticTile",
                   "properties": {
@@ -64,6 +65,15 @@
                     "title": "Manage Reviews",
                     "description": "Add/edit/delete reviews"
                   }
+                },
+                {
+                  "id": "manage-genres",
+                  "tileType": "sap.ushell.ui.tile.StaticTile",
+                  "properties": {
+                    "targetURL": "#Genres-manage",
+                    "title": "Manage Genres",
+                    "description": "Add/edit/delete genres" 
+                  }
                 }
               ]
             },
@@ -129,8 +139,8 @@
               },
               "resolutionResult": {
                 "applicationType": "SAPUI5",
-                "additionalInformation": "SAPUI5.Component=genres",
-                "url": "/genres/webapp"
+                "additionalInformation": "SAPUI5.Component=browse-genres",
+                "url": "/browse-genres/webapp"
               }
             },
             "manage-books": {
@@ -146,6 +156,19 @@
                 "url": "/admin/webapp"
               }
             },
+            "manage-genres": {
+              "semanticObject": "Genres",
+              "action": "manage",
+              "signature": {
+                "parameters": {},
+                "additionalParameters": "allowed"
+              },
+              "resolutionResult": {
+                "applicationType": "SAPUI5",
+                "additionalInformation": "SAPUI5.Component=genres",
+                "url": "/genres/webapp"
+              }
+            },
             "manage-orders": {
               "semanticObject": "Orders",
               "action": "manage",
diff --git a/app/browse-genres/fiori-service.cds b/app/browse-genres/fiori-service.cds
new file mode 100644
index 00000000..0fe951c0
--- /dev/null
+++ b/app/browse-genres/fiori-service.cds
@@ -0,0 +1,22 @@
+/*
+  UI annotations for the Browse GenreHierarchy App
+*/
+
+using CatalogService from '../../srv/cat-service';
+
+
+annotate CatalogService.GenreHierarchy with @Aggregation.RecursiveHierarchy#GenreHierarchy: {
+    $Type: 'Aggregation.RecursiveHierarchyType',
+    NodeProperty: ID, // identifies a node
+    ParentNavigationProperty: parent // navigates to a node's parent
+  };
+
+annotate CatalogService.GenreHierarchy with @Hierarchy.RecursiveHierarchy#GenreHierarchy: {
+  $Type: 'Hierarchy.RecursiveHierarchyType',
+  LimitedDescendantCount: LimitedDescendantCount,
+  DistanceFromRoot: DistanceFromRoot,
+  DrillState: DrillState,
+  Matched: Matched,
+  MatchedDescendantCount: MatchedDescendantCount,
+  LimitedRank: LimitedRank
+};
diff --git a/app/browse-genres/package.json b/app/browse-genres/package.json
new file mode 100644
index 00000000..2809c302
--- /dev/null
+++ b/app/browse-genres/package.json
@@ -0,0 +1,12 @@
+{
+  "name": "browse-genres",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "keywords": [],
+  "author": "",
+  "license": "ISC"
+}
diff --git a/app/browse-genres/webapp/Component.js b/app/browse-genres/webapp/Component.js
new file mode 100644
index 00000000..5fa2ad5d
--- /dev/null
+++ b/app/browse-genres/webapp/Component.js
@@ -0,0 +1,3 @@
+sap.ui.define(["sap/fe/core/AppComponent"], ac => ac.extend("browse-genres.Component", {
+    metadata:{ manifest:'json' }
+}))
diff --git a/app/browse-genres/webapp/i18n/i18n.properties b/app/browse-genres/webapp/i18n/i18n.properties
new file mode 100644
index 00000000..d2792ee9
--- /dev/null
+++ b/app/browse-genres/webapp/i18n/i18n.properties
@@ -0,0 +1,2 @@
+appTitle=Browse Genres
+appDescription=Genres as Tree View
diff --git a/app/browse-genres/webapp/i18n/i18n_de.properties b/app/browse-genres/webapp/i18n/i18n_de.properties
new file mode 100644
index 00000000..e8714e92
--- /dev/null
+++ b/app/browse-genres/webapp/i18n/i18n_de.properties
@@ -0,0 +1,2 @@
+appTitle=Zeige Genres
+appDescription=Genres als Baumansicht
diff --git a/app/browse-genres/webapp/index.html b/app/browse-genres/webapp/index.html
new file mode 100644
index 00000000..167596a7
--- /dev/null
+++ b/app/browse-genres/webapp/index.html
@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>Browse Genres</title>
+    <style>
+        html, body, body > div, #container, #container-uiarea {
+            height: 100%;
+        }
+    </style>
+    <script
+        id="sap-ui-bootstrap"
+        src="https://sapui5.hana.ondemand.com/resources/sap-ui-core.js"
+        data-sap-ui-theme="sap_fiori_3"
+        data-sap-ui-resourceroots='{
+            "browse-genres": "./"
+        }'
+        data-sap-ui-oninit="module:sap/ui/core/ComponentSupport"
+        data-sap-ui-compatVersion="edge"
+        data-sap-ui-async="true"
+        data-sap-ui-frameOptions="trusted"
+    ></script>
+</head>
+<body class="sapUiBody sapUiSizeCompact" id="content">
+    <div
+        data-sap-ui-component
+        data-name="browse-genres"
+        data-id="container"
+        data-settings='{"id" : "browse-genres"}'
+        data-handle-validation="true"
+    ></div>
+</body>
+</html>
diff --git a/app/browse-genres/webapp/manifest.json b/app/browse-genres/webapp/manifest.json
new file mode 100644
index 00000000..875c6231
--- /dev/null
+++ b/app/browse-genres/webapp/manifest.json
@@ -0,0 +1,124 @@
+{
+	"_version": "1.8.0",
+	"sap.app": {
+		"id": "browse-genres",
+		"type": "application",
+		"title": "{{appTitle}}",
+		"description": "{{appDescription}}",
+		"applicationVersion": {
+			"version": "1.0.0"
+		},
+		"dataSources": {
+			"CatalogService": {
+				"uri": "/api/browse/",
+				"type": "OData",
+				"settings": {
+					"odataVersion": "4.0"
+				}
+			}
+		},
+		"crossNavigation": {
+			"inbounds": {
+				"Genres-show": {
+					"signature": {
+						"parameters": {},
+						"additionalParameters": "allowed"
+					},
+					"semanticObject": "GenreHierarchy",
+					"action": "show"
+				}
+			}
+		}
+	},
+	"sap.ui5": {
+		"dependencies": {
+			"minUI5Version": "1.122.0",
+			"libs": {
+				"sap.fe.templates": {}
+			}
+		},
+		"models": {
+			"i18n": {
+				"type": "sap.ui.model.resource.ResourceModel",
+				"uri": "i18n/i18n.properties"
+			},
+			"": {
+				"dataSource": "CatalogService",
+				"settings": {
+					"synchronizationMode": "None",
+					"operationMode": "Server",
+					"autoExpandSelect" : true,
+					"earlyRequests": true,
+					"groupProperties": {
+						"default": {
+						  "submit": "Auto"
+						}
+					}
+				}
+			}
+		},
+		"routing": {
+			"routes": [
+				{
+					"pattern": ":?query:",
+					"name": "GenreHierarchyList",
+					"target": "GenreHierarchyList"
+				},
+				{
+					"pattern": "GenreHierarchy({key}):?query:",
+					"name": "GenreHierarchyDetails",
+					"target": "GenreHierarchyDetails"
+				}
+			],
+			"targets": {
+				"GenreHierarchyList": {
+					"type": "Component",
+					"id": "GenreHierarchyList",
+					"name": "sap.fe.templates.ListReport",
+					"options": {
+						"settings" : {
+							"contextPath" : "/GenreHierarchy",
+							"navigation" : {
+								"GenreHierarchy" : {
+									"detail" : {
+										"route" : "GenreHierarchyDetails"
+									}
+								}
+							},
+							"controlConfiguration": {
+                                "@com.sap.vocabularies.UI.v1.LineItem": {
+                                    "tableSettings": {
+                                        "hierarchyQualifier": "GenreHierarchy",
+                                        "type": "TreeTable"
+                                    }
+                                }
+                            }
+						}
+					}
+				},
+				"GenreHierarchyDetails": {
+					"type": "Component",
+					"id": "GenreHierarchyDetails",
+					"name": "sap.fe.templates.ObjectPage",
+					"options": {
+						"settings" : {
+							"contextPath" : "/GenreHierarchy"
+						}
+					}
+				}
+			}
+		},
+		"contentDensities": {
+			"compact": true,
+			"cozy": true
+		}
+	},
+	"sap.ui": {
+		"technology": "UI5",
+		"fullWidth": false
+	},
+	"sap.fiori": {
+		"registrationIds": [],
+		"archeType": "transactional"
+	}
+}
diff --git a/app/browse/fiori-service.cds b/app/browse/fiori-service.cds
index 953c39dc..07ecb564 100644
--- a/app/browse/fiori-service.cds
+++ b/app/browse/fiori-service.cds
@@ -161,6 +161,19 @@ annotate CatalogService.Reviews with @(UI : {
     ]}
 });
 
+annotate CatalogService.GenreHierarchy with @UI: {
+    PresentationVariant  : {
+        $Type         : 'UI.PresentationVariantType',
+        RequestAtLeast: [name],
+        Visualizations: ['@UI.LineItem'],
+    },
+    LineItem               : [{
+        $Type: 'UI.DataField',
+        Value: name,
+        Label : '{i18n>Genre}'
+    }],
+};
+
 annotate CatalogService.Books actions {
     @(
         Common.SideEffects : {
diff --git a/app/common.cds b/app/common.cds
index ba638052..f9df40b2 100644
--- a/app/common.cds
+++ b/app/common.cds
@@ -206,8 +206,6 @@ annotate my.Genres with
 //	Genres Elements
 //
 annotate my.Genres with {
-    ID
-    @title : '{i18n>ID}';
     name
     @title : '{i18n>Genre}';
 }
diff --git a/app/fiori.html b/app/fiori.html
index 7fa46503..845ec889 100644
--- a/app/fiori.html
+++ b/app/fiori.html
@@ -14,8 +14,8 @@
 		};
 	</script>
 
-	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.131.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
-	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.131.0/resources/sap-ui-core.js"
+	<script id="sap-ushell-bootstrap" src="https://sapui5.hana.ondemand.com/1.133.0/test-resources/sap/ushell/bootstrap/sandbox.js"></script>
+	<script id="sap-ui-bootstrap" src="https://sapui5.hana.ondemand.com/1.133.0/resources/sap-ui-core.js"
 			data-sap-ui-libs="sap.m, sap.ushell, sap.collaboration, sap.ui.layout"
 			data-sap-ui-compatVersion="edge"
 			data-sap-ui-theme="sap_horizon"
diff --git a/app/genres/fiori-service.cds b/app/genres/fiori-service.cds
index fd4a556a..6c91516c 100644
--- a/app/genres/fiori-service.cds
+++ b/app/genres/fiori-service.cds
@@ -1,5 +1,5 @@
 /*
-  UI annotations for the Browse GenreHierarchy App
+  UI annotations for the Manage GenreHierarchy App
 */
 
 using AdminService from '../../srv/admin-service';
diff --git a/app/genres/webapp/i18n/i18n.properties b/app/genres/webapp/i18n/i18n.properties
index d2792ee9..fe21b6cb 100644
--- a/app/genres/webapp/i18n/i18n.properties
+++ b/app/genres/webapp/i18n/i18n.properties
@@ -1,2 +1,2 @@
-appTitle=Browse Genres
-appDescription=Genres as Tree View
+appTitle=Manage Genres
+appDescription=Modifiable Genres as Tree View
diff --git a/app/genres/webapp/i18n/i18n_de.properties b/app/genres/webapp/i18n/i18n_de.properties
index e8714e92..112fe918 100644
--- a/app/genres/webapp/i18n/i18n_de.properties
+++ b/app/genres/webapp/i18n/i18n_de.properties
@@ -1,2 +1,2 @@
-appTitle=Zeige Genres
-appDescription=Genres als Baumansicht
+appTitle=Administriere Genres
+appDescription=Modifizierbare Genres als Baumansicht
diff --git a/app/index.cds b/app/index.cds
index 0c07c888..70b25677 100644
--- a/app/index.cds
+++ b/app/index.cds
@@ -9,4 +9,5 @@ using from './reviews/fiori-service';
 using from './notes/fiori-service';
 using from './addresses/fiori-service';
 using from './genres/fiori-service';
+using from './browse-genres/fiori-service';
 using from './common';
diff --git a/app/xs-app.json b/app/xs-app.json
index 4facc67d..e4793b84 100644
--- a/app/xs-app.json
+++ b/app/xs-app.json
@@ -34,6 +34,11 @@
 			"localDir": "./",
 			"authenticationType": "xsuaa"
 		},
+		{
+			"source": "^/browse-genres/webapp/(.*)$",
+			"localDir": "./",
+			"authenticationType": "xsuaa"
+		},
 		{
 			"source": "^/reviews/webapp/(.*)$",
 			"localDir": "./",
diff --git a/db/books.cds b/db/books.cds
index 82e63043..1d94da29 100644
--- a/db/books.cds
+++ b/db/books.cds
@@ -22,6 +22,7 @@ entity Books : cuid, managed {
     reviews      : Association to many Reviews
                        on reviews.book = $self;
     isReviewable : TechnicalBooleanFlag not null default true;
+    contents     : Composition of many Contents on contents.book = $self @odata.contained:false;
 }
 
 entity Authors : cuid, managed {
@@ -50,8 +51,20 @@ annotate Authors with
  * Hierarchically organized Code List for Genres
  */
 entity Genres : sap.common.CodeList {
-    key ID       : Integer;
-        parent   : Association to Genres;
-        children : Composition of many Genres
-                       on children.parent = $self;
+    key ID          : UUID;
+        siblingRank : Integer; 
+        parent      : Association to Genres;
+        children    : Composition of many Genres on children.parent = $self;
 }
+
+/**
+ * Hierarchically organized entity for Contents
+ */
+entity Contents {
+    key ID     : UUID;
+        name   : String;
+        page   : Integer;
+        parent : Association to Contents @odata.draft.enclosed;
+        book   : Association to Books;
+}
+
diff --git a/db/data/my.bookshop-Books.csv b/db/data/my.bookshop-Books.csv
index e5453379..a081cbc3 100644
--- a/db/data/my.bookshop-Books.csv
+++ b/db/data/my.bookshop-Books.csv
@@ -1,6 +1,6 @@
 ID;TITLE;DESCR;AUTHOR_ID;STOCK;PRICE;CURRENCY_CODE;GENRE_ID;RATING;ISBN
-f846b0b9-01d4-4f6d-82a4-d79204f62278;Wuthering Heights;"Wuthering Heights, Emily Brontë's only novel, was published in 1847 under the pseudonym ""Ellis Bell"". It was written between October 1845 and June 1846. Wuthering Heights and Anne Brontë's Agnes Grey were accepted by publisher Thomas Newby before the success of their sister Charlotte's novel Jane Eyre. After Emily's death, Charlotte edited the manuscript of Wuthering Heights and arranged for the edited version to be published as a posthumous second edition in 1850.";335c7bcd-b826-4f14-a788-e0bf6738617a;12;11.11;GBP;103;4.5;979-8698267973
-9b084139-0b1e-43b6-b12a-7b3669d75f02;Jane Eyre;"Jane Eyre /ɛər/ (originally published as Jane Eyre: An Autobiography) is a novel by English writer Charlotte Brontë, published under the pen name ""Currer Bell"", on 16 October 1847, by Smith, Elder & Co. of London. The first American edition was published the following year by Harper & Brothers of New York. Primarily a bildungsroman, Jane Eyre follows the experiences of its eponymous heroine, including her growth to adulthood and her love for Mr. Rochester, the brooding master of Thornfield Hall. The novel revolutionised prose fiction in that the focus on Jane's moral and spiritual development is told through an intimate, first-person narrative, where actions and events are coloured by a psychological intensity. The book contains elements of social criticism, with a strong sense of Christian morality at its core and is considered by many to be ahead of its time because of Jane's individualistic character and how the novel approaches the topics of class, sexuality, religion and feminism.";e3da2c2e-72ee-45d5-8def-52964c7b252a;11;12.34;GBP;103;3.0;979-8598716472
-51061ce3-ddde-4d70-a2dc-6314afbcc73e;The Raven;"“The Raven"" is a narrative poem by American writer Edgar Allan Poe. First published in January 1845, the poem is often noted for its musicality, stylized language, and supernatural atmosphere. It tells of a talking raven's mysterious visit to a distraught lover, tracing the man's slow fall into madness. The lover, often identified as being a student, is lamenting the loss of his love, Lenore. Sitting on a bust of Pallas, the raven seems to further distress the protagonist with its constant repetition of the word ""Nevermore"". The poem makes use of folk, mythological, religious, and classical references.";e7643aae-2d2f-4656-bb2d-1328ad3c8045;333;13.13;USD;117;2.5;978-1092909747
-aebdfc8a-0dfa-4468-bd36-48aabd65e663;Eleonora;"""Eleonora"" is a short story by Edgar Allan Poe, first published in 1842 in Philadelphia in the literary annual The Gift. It is often regarded as somewhat autobiographical and has a relatively ""happy"" ending.";e7643aae-2d2f-4656-bb2d-1328ad3c8045;555;14;USD;117;1.0;979-8669820985
-4a519e61-3c3a-4bd9-ab12-d7e0c5329933;Catweazle;Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.;3c081d9d-abda-4da9-8b6a-4f4555bb26bc;22;15;EUR;110;4.0;978-3473523023
+f846b0b9-01d4-4f6d-82a4-d79204f62278;Wuthering Heights;"Wuthering Heights, Emily Brontë's only novel, was published in 1847 under the pseudonym ""Ellis Bell"". It was written between October 1845 and June 1846. Wuthering Heights and Anne Brontë's Agnes Grey were accepted by publisher Thomas Newby before the success of their sister Charlotte's novel Jane Eyre. After Emily's death, Charlotte edited the manuscript of Wuthering Heights and arranged for the edited version to be published as a posthumous second edition in 1850.";335c7bcd-b826-4f14-a788-e0bf6738617a;12;11.11;GBP;f283b1b3-b763-42f9-95f0-38e1d78a1d7e;4.5;979-8698267973
+9b084139-0b1e-43b6-b12a-7b3669d75f02;Jane Eyre;"Jane Eyre /ɛər/ (originally published as Jane Eyre: An Autobiography) is a novel by English writer Charlotte Brontë, published under the pen name ""Currer Bell"", on 16 October 1847, by Smith, Elder & Co. of London. The first American edition was published the following year by Harper & Brothers of New York. Primarily a bildungsroman, Jane Eyre follows the experiences of its eponymous heroine, including her growth to adulthood and her love for Mr. Rochester, the brooding master of Thornfield Hall. The novel revolutionised prose fiction in that the focus on Jane's moral and spiritual development is told through an intimate, first-person narrative, where actions and events are coloured by a psychological intensity. The book contains elements of social criticism, with a strong sense of Christian morality at its core and is considered by many to be ahead of its time because of Jane's individualistic character and how the novel approaches the topics of class, sexuality, religion and feminism.";e3da2c2e-72ee-45d5-8def-52964c7b252a;11;12.34;GBP;d74eb118-ff57-4776-96d3-0d649278bf6b;3.0;979-8598716472
+51061ce3-ddde-4d70-a2dc-6314afbcc73e;The Raven;"“The Raven"" is a narrative poem by American writer Edgar Allan Poe. First published in January 1845, the poem is often noted for its musicality, stylized language, and supernatural atmosphere. It tells of a talking raven's mysterious visit to a distraught lover, tracing the man's slow fall into madness. The lover, often identified as being a student, is lamenting the loss of his love, Lenore. Sitting on a bust of Pallas, the raven seems to further distress the protagonist with its constant repetition of the word ""Nevermore"". The poem makes use of folk, mythological, religious, and classical references.";e7643aae-2d2f-4656-bb2d-1328ad3c8045;333;13.13;USD;7125da65-b3ae-4a0b-a735-1db410a3e079;2.5;978-1092909747
+aebdfc8a-0dfa-4468-bd36-48aabd65e663;Eleonora;"""Eleonora"" is a short story by Edgar Allan Poe, first published in 1842 in Philadelphia in the literary annual The Gift. It is often regarded as somewhat autobiographical and has a relatively ""happy"" ending.";e7643aae-2d2f-4656-bb2d-1328ad3c8045;555;14;USD;a530cd31-b0cf-4a32-9f28-72ee7b9f29fc;1.0;979-8669820985
+4a519e61-3c3a-4bd9-ab12-d7e0c5329933;Catweazle;Catweazle is a British fantasy television series, starring Geoffrey Bayldon in the title role, and created by Richard Carpenter for London Weekend Television. The first series, produced and directed by Quentin Lawrence, was screened in the UK on ITV in 1970. The second series, directed by David Reid and David Lane, was shown in 1971. Each series had thirteen episodes, most but not all written by Carpenter, who also published two books based on the scripts.;3c081d9d-abda-4da9-8b6a-4f4555bb26bc;22;15;EUR;5b091c64-8b4f-401a-a06d-61b19857635b;4.0;978-3473523023
diff --git a/db/data/my.bookshop-Contents.csv b/db/data/my.bookshop-Contents.csv
new file mode 100644
index 00000000..93700a76
--- /dev/null
+++ b/db/data/my.bookshop-Contents.csv
@@ -0,0 +1,64 @@
+ID;parent_ID;name;page;book_ID
+f846b0b9-01d4-4f6d-82a4-d79204f62514;;Foreword;3;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62515;;Chapter 1;4;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62516;f846b0b9-01d4-4f6d-82a4-d79204f62515;Section 1.1;5;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62517;f846b0b9-01d4-4f6d-82a4-d79204f62515;Section 1.2;28;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62518;f846b0b9-01d4-4f6d-82a4-d79204f62517;Subsection 1.2.1;30;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62519;f846b0b9-01d4-4f6d-82a4-d79204f62517;Subsection 1.2.2;33;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62520;f846b0b9-01d4-4f6d-82a4-d79204f62515;Section 1.3;36;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62521;;Chapter 2;54;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62522;f846b0b9-01d4-4f6d-82a4-d79204f62521;Section 2.1;56;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62523;f846b0b9-01d4-4f6d-82a4-d79204f62521;Section 2.2;58;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62524;;Conclusion;63;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62525;;Endnotes;65;9b084139-0b1e-43b6-b12a-7b3669d75f02
+f846b0b9-01d4-4f6d-82a4-d79204f62526;;Copyright notice;2;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62527;;Chapter 1;3;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62528;f846b0b9-01d4-4f6d-82a4-d79204f62527;Section 1.1;5;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62529;f846b0b9-01d4-4f6d-82a4-d79204f62527;Section 1.2;13;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62530;;Chapter 2;20;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62531;f846b0b9-01d4-4f6d-82a4-d79204f62530;Section 2.1;21;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62532;f846b0b9-01d4-4f6d-82a4-d79204f62530;Section 2.2;25;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62533;f846b0b9-01d4-4f6d-82a4-d79204f62530;Section 2.3;27;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62534;;Chapter 3;30;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62535;;Endnotes;41;51061ce3-ddde-4d70-a2dc-6314afbcc73e
+f846b0b9-01d4-4f6d-82a4-d79204f62551;;Acknowledgements;1;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62552;;The Flight;2;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62553;;Hexwood Farm;8;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62554;f846b0b9-01d4-4f6d-82a4-d79204f62553;Castle Saburac;13;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62555;f846b0b9-01d4-4f6d-82a4-d79204f62553;The Curse of Rapkyn;27;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62556;f846b0b9-01d4-4f6d-82a4-d79204f62553;The Mannikin;35;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62557;;The Eye of Time;44;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62558;;The Enchanting;59;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62559;f846b0b9-01d4-4f6d-82a4-d79204f62558;The Telling Bone;73;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62560;f846b0b9-01d4-4f6d-82a4-d79204f62558;The Power of Adamcos;86;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62561;f846b0b9-01d4-4f6d-82a4-d79204f62558;The House of the Sorcerer;98;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62562;;The Changeling;105;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62563;f846b0b9-01d4-4f6d-82a4-d79204f62562;The Flying Broomsticks;118;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62564;f846b0b9-01d4-4f6d-82a4-d79204f62563;The Fish Out of Water;126;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62565;;The Final Magic;138;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62566;;Copyright;159;4a519e61-3c3a-4bd9-ab12-d7e0c5329933
+f846b0b9-01d4-4f6d-82a4-d79204f62567;;Editor's Note;1;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62568;;Chapter I;2;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62569;;Chapter II;31;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62570;f846b0b9-01d4-4f6d-82a4-d79204f62569;Section II.I;47;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62571;f846b0b9-01d4-4f6d-82a4-d79204f62569;Section II.II;62;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62572;f846b0b9-01d4-4f6d-82a4-d79204f62569;Section II.III;75;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62573;f846b0b9-01d4-4f6d-82a4-d79204f62569;Section II.IV;87;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62574;;Chapter III;105;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62575;f846b0b9-01d4-4f6d-82a4-d79204f62574;Section III.I;128;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62576;f846b0b9-01d4-4f6d-82a4-d79204f62575;Subsection III.I.I;156;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62577;f846b0b9-01d4-4f6d-82a4-d79204f62575;Subsection III.I.II;173;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62578;f846b0b9-01d4-4f6d-82a4-d79204f62574;Section III.II;185;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62579;;Chapter IV;203;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62580;;Acknowledgments;250;f846b0b9-01d4-4f6d-82a4-d79204f62278
+f846b0b9-01d4-4f6d-82a4-d79204f62582;;Foreword;1;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62583;;Chapter 1;3;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62584;f846b0b9-01d4-4f6d-82a4-d79204f62583;Section 1.1;5;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62585;f846b0b9-01d4-4f6d-82a4-d79204f62583;Section 1.2;8;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62586;;Chapter 2;10;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62587;f846b0b9-01d4-4f6d-82a4-d79204f62586;Section 2.1;12;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62588;f846b0b9-01d4-4f6d-82a4-d79204f62587;Subsection 2.1.1;14;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62589;f846b0b9-01d4-4f6d-82a4-d79204f62587;Subsection 2.1.2;16;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62590;f846b0b9-01d4-4f6d-82a4-d79204f62586;Section 2.2;18;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62591;f846b0b9-01d4-4f6d-82a4-d79204f62590;Subsection 2.2.1;21;aebdfc8a-0dfa-4468-bd36-48aabd65e663
+f846b0b9-01d4-4f6d-82a4-d79204f62592;;Endnotes;25;aebdfc8a-0dfa-4468-bd36-48aabd65e663
diff --git a/db/data/my.bookshop-Genres.csv b/db/data/my.bookshop-Genres.csv
index 84bb85b0..2bc412b2 100644
--- a/db/data/my.bookshop-Genres.csv
+++ b/db/data/my.bookshop-Genres.csv
@@ -1,31 +1,34 @@
-ID;parent_ID;name
-100;;Fiction
-101;100;Action
-102;100;Adventure
-103;100;Drama
-105;100;Poetry
-106;100;Science Fiction
-107;106;Utopian and Dystopian
-108;107;Dystopia
-109;108;Cyberpunk
-110;109;Steampunk
-104;100;Fantasy
-111;104;Epic fantasy
-112;104;High fantasy
-113;100;Graphic Novel
-115;100;Short Story
-116;100;Romance
-117;100;Mystery
-123;117;Thriller
-124;117;Suspense
-118;100;Horror
-119;100;Historical Fiction
-120;100;Contemporary Fiction
-121;100;Magical Realism
-122;100;Literary Fiction
-128;100;Fairy Tale
-200;;Non-Fiction
-201;200;Biography
-202;201;Autobiography
-203;200;Essay
-204;200;Speech
+ID;parent_ID;name;siblingRank
+8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;;Fiction;1000
+08467c69-4b69-4b30-bf51-998f9c4b8a12;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Action;1500
+c5247996-2516-40c5-b3ea-02492a1e1f4d;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Adventure;3000
+d74eb118-ff57-4776-96d3-0d649278bf6b;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Drama;4000
+b84a7e92-cc0c-4599-8b62-9e3ae39e343f;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Poetry;5000
+445a6c1e-071f-4e9d-b0bb-670ec73b0a49;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Fantasy;6000
+0d4f268f-c5c5-4a82-b54a-2120271cf54e;445a6c1e-071f-4e9d-b0bb-670ec73b0a49;Epic fantasy;7000
+5ccfe8e7-009f-4744-91fd-c1c1e9a0c9c6;445a6c1e-071f-4e9d-b0bb-670ec73b0a49;High fantasy;8000
+86e9f4d5-3e7c-4c06-8421-8b6d72fe9c93;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Science Fiction;9000
+9f8653a2-6d6d-4fd7-b02f-b90d15d6f67f;86e9f4d5-3e7c-4c06-8421-8b6d72fe9c93;Utopian and Dystopian;10000
+7c7b2c30-c24e-4627-bb84-0f9d09f9e91b;9f8653a2-6d6d-4fd7-b02f-b90d15d6f67f;Dystopia;11000
+34f6a939-2708-4cc0-9882-daf36a8ed5e6;7c7b2c30-c24e-4627-bb84-0f9d09f9e91b;Cyberpunk;12000
+4297bff9-c4b3-4097-b68f-5605f89c6e4c;34f6a939-2708-4cc0-9882-daf36a8ed5e6;Steampunk;13000
+f283b1b3-b763-42f9-95f0-38e1d78a1d7e;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Romance;14000
+5d2c5060-84cf-4a94-9118-8d9ad88f2a24;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Mystery;15000
+7d6cc413-cf8c-4cf9-b30a-bf8cf6f97b72;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Graphic Novel;16000
+f846b0b9-01d4-4f6d-82a4-d79204f62576;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Thriller;17000
+82f9a2d9-bd77-4cfd-9c76-d03b8f6827a3;f846b0b9-01d4-4f6d-82a4-d79204f62576;Suspense;18000
+a7b5b4d7-bff3-430d-9d7e-25fd67b66022;f846b0b9-01d4-4f6d-82a4-d79204f62576;Crime thriller;19000
+5f93c395-6f8a-43de-84c1-bf22cfba8f56;f846b0b9-01d4-4f6d-82a4-d79204f62576;Spy thriller;20000
+3ff51d9c-5ff5-421f-8d0d-d75b08e32a25;f846b0b9-01d4-4f6d-82a4-d79204f62576;Political thriller;21000
+a530cd31-b0cf-4a32-9f28-72ee7b9f29fc;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Short Story;23000
+5b091c64-8b4f-401a-a06d-61b19857635b;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Fairy Tale;24000
+7125da65-b3ae-4a0b-a735-1db410a3e079;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Horror;25000
+a02b5c9b-b79f-43ef-b2ab-28e4b431cc18;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Historical Fiction;26000
+d6c3448e-d771-47f0-b6c7-8d2159b29d2a;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Contemporary Fiction;27000
+7ed5cfab-8c4d-46a3-b89b-c5b8fa74f049;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Magical Realism;28000
+23e86990-66d3-4488-8272-98ed056710b5;8bbf14c6-b378-4e35-9b4f-5a9c8b8762da;Literary Fiction;29000
+85b5a640-7e9a-468e-80e2-e9268486031b;;Non-Fiction;30000
+10d19b1a-832b-4d60-bf9b-88dcd089db85;85b5a640-7e9a-468e-80e2-e9268486031b;Biography;31000
+1f1c8b5b-451e-48f6-bdbb-759be4ea1a8f;10d19b1a-832b-4d60-bf9b-88dcd089db85;Autobiography;32000
+4bc5ad4d-b7a3-47a7-9938-325c6fdf8041;85b5a640-7e9a-468e-80e2-e9268486031b;Essay;33000
+e0d350c2-1f42-45b5-b768-67cccd997b56;85b5a640-7e9a-468e-80e2-e9268486031b;Speech;34000
\ No newline at end of file
diff --git a/srv/admin-service.cds b/srv/admin-service.cds
index 4d3b93f3..2a1316a1 100644
--- a/srv/admin-service.cds
+++ b/srv/admin-service.cds
@@ -1,4 +1,4 @@
-using {sap.common.Languages as CommonLanguages} from '@sap/cds/common';
+using {sap.common.Languages as CommonLanguages, cuid} from '@sap/cds/common';
 using {my.bookshop as my} from '../db/index';
 using {sap.changelog as changelog} from 'com.sap.cds/change-tracking';
 using {my.common.Hierarchy as Hierarchy} from './hierarchy';
@@ -21,7 +21,18 @@ service AdminService @(requires: 'admin') {
   entity Authors        as projection on my.Authors;
   entity Orders         as select from my.Orders;
   extend my.Genres with Hierarchy;
-  entity GenreHierarchy as projection on my.Genres;
+
+  type NextSibling : cuid { };
+  entity GenreHierarchy as projection on my.Genres
+    excluding {children} order by siblingRank
+    actions {
+      // Experimental UI feature, see:
+      // https://github.com/SAP/odata-vocabularies/blob/main/vocabularies/Hierarchy.md#template_changenextsiblingaction-experimental
+      action moveSibling(NextSibling : NextSibling);
+    };
+
+  extend my.Contents with Hierarchy;
+  entity ContentsHierarchy as projection on my.Contents;
 
   @cds.persistence.skip
   entity Upload @odata.singleton {
@@ -45,6 +56,7 @@ annotate AdminService.Books with @cds.search: {
 // Enable Fiori Draft for Orders
 annotate AdminService.Orders with @odata.draft.enabled;
 annotate AdminService.Books with @odata.draft.enabled;
+annotate AdminService.GenreHierarchy with @odata.draft.enabled;
 
 // workaround to enable the value help for languages
 // Necessary because auto exposure is currently not working
diff --git a/srv/cat-service.cds b/srv/cat-service.cds
index e887271f..f11bb69e 100644
--- a/srv/cat-service.cds
+++ b/srv/cat-service.cds
@@ -1,6 +1,8 @@
 using {my.bookshop as my} from '../db/index';
+using {my.common.Hierarchy as Hierarchy} from './hierarchy';
 
 @path : 'browse'
+@odata.apply.transformations
 service CatalogService @(requires: 'any') {
     @readonly
     entity Books       as projection on my.Books excluding {
@@ -16,6 +18,10 @@ service CatalogService @(requires: 'any') {
     @readonly
     entity Reviews     as projection on my.Reviews;
 
+    extend my.Genres with Hierarchy;
+    @readonly
+    entity GenreHierarchy as projection on my.Genres;
+
     action submitOrder(book : Books : ID, quantity : Integer) returns {
         stock : Integer
     };
diff --git a/srv/src/main/java/my/bookshop/handlers/AdminServiceHandler.java b/srv/src/main/java/my/bookshop/handlers/AdminServiceHandler.java
index ddf2b7fa..1b9c32c5 100644
--- a/srv/src/main/java/my/bookshop/handlers/AdminServiceHandler.java
+++ b/srv/src/main/java/my/bookshop/handlers/AdminServiceHandler.java
@@ -277,7 +277,7 @@ public void addBooksViaCsv(CdsUpdateEventContext context, Upload upload) {
 					book.setStock(Integer.valueOf(p[4]).intValue());
 					book.setPrice(BigDecimal.valueOf(Double.valueOf(p[5])));
 					book.setCurrencyCode(p[6]);
-					book.setGenreId(Integer.valueOf(p[7]));
+					book.setGenreId(String.valueOf(p[7]));
 
 					// separate transaction per line
 					context.getCdsRuntime().changeSetContext().run(ctx -> {
diff --git a/srv/src/main/java/my/bookshop/handlers/HierarchyHandler.java b/srv/src/main/java/my/bookshop/handlers/HierarchyHandler.java
index bdd875a0..4ffe06c3 100644
--- a/srv/src/main/java/my/bookshop/handlers/HierarchyHandler.java
+++ b/srv/src/main/java/my/bookshop/handlers/HierarchyHandler.java
@@ -35,15 +35,15 @@
 import com.sap.cds.services.handler.annotations.ServiceName;
 import com.sap.cds.services.persistence.PersistenceService;
 
-import cds.gen.adminservice.AdminService_;
-import cds.gen.adminservice.GenreHierarchy;
-import cds.gen.adminservice.GenreHierarchy_;
+import cds.gen.catalogservice.CatalogService_;
+import cds.gen.catalogservice.GenreHierarchy;
+import cds.gen.catalogservice.GenreHierarchy_;
 
-import static cds.gen.adminservice.AdminService_.GENRE_HIERARCHY;
+import static cds.gen.catalogservice.CatalogService_.GENRE_HIERARCHY;
 
 @Component
 @Profile("default") // non-HANA
-@ServiceName(AdminService_.CDS_NAME)
+@ServiceName(CatalogService_.CDS_NAME)
 /**
  * On HANA, requests for GenreHierarchy are handled generically.
  * 
@@ -105,8 +105,8 @@ private void setResult(CdsReadEventContext event, List<GenreHierarchy> result) {
     }
 
     private void addDrillState(List<GenreHierarchy> ghs) {
-        List<Integer> ids = ghs.stream().map(gh -> gh.getId()).toList();
-        Set<Integer> parents = ghs.stream().map(gh -> gh.getParentId()).filter(p -> p != null)
+        List<String> ids = ghs.stream().map(gh -> gh.getId()).toList();
+        Set<String> parents = ghs.stream().map(gh -> gh.getParentId()).filter(p -> p != null)
                 .collect(Collectors.toSet());
         CqnSelect q = Select.from(GENRE_HIERARCHY).columns(gh -> gh.parent_ID().as("id"))
                 .where(gh -> gh.parent_ID().in(ids));
@@ -115,7 +115,7 @@ private void addDrillState(List<GenreHierarchy> ghs) {
                 .stream().map(r -> r.get("id")).collect(Collectors.toSet());
 
         for (GenreHierarchy gh : ghs) {
-            Integer id = gh.getId();
+            String id = gh.getId();
             if (nonLeafs.contains(id)) {
                 if (parents.contains(id)) {
                     gh.setDrillState("expanded");
@@ -163,7 +163,7 @@ private CqnPredicate ancestorsFilter(CqnAncestorsTransformation ancestors) {
                         gh -> gh.parent().parent().parent().parent().ID().as("i4"))
                 .where(gh -> gh.ID().in(inner));
 
-        Set<Integer> ancestorIds = new HashSet<>();
+        Set<String> ancestorIds = new HashSet<>();
         db.run(outer).stream().forEach(r -> {
             addIfNotNull(ancestorIds, r, "i0");
             addIfNotNull(ancestorIds, r, "i1");
@@ -186,7 +186,7 @@ private List<GenreHierarchy> handleDescendants(CqnDescendantsTransformation desc
     }
 
     private static void connect(List<GenreHierarchy> nodes) {
-        Map<Integer, GenreHierarchy> lookup = new HashMap<>();
+        Map<String, GenreHierarchy> lookup = new HashMap<>();
         nodes.forEach(gh -> lookup.put(gh.getId(), gh));
         nodes.forEach(gh -> gh.setParent(lookup.get(gh.getParentId())));
         nodes.forEach(gh -> gh.setDistanceFromRoot(distanceFromRoot(gh)));
@@ -199,8 +199,8 @@ private List<GenreHierarchy> handleAncestors(CqnAncestorsTransformation ancestor
         return topLevels(topLevels, filter);
     }
 
-    private void addIfNotNull(Set<Integer> ancestorIds, Row r, String key) {
-        Integer id = (Integer) r.get(key);
+    private void addIfNotNull(Set<String> ancestorIds, Row r, String key) {
+        String id = (String) r.get(key);
         if (id != null) {
             ancestorIds.add(id);
         }
@@ -212,7 +212,7 @@ private List<GenreHierarchy> topLevels(CqnTopLevelsTransformation topLevels, Cqn
 
     private List<GenreHierarchy> topLevelsLimit(CqnTopLevelsTransformation topLevels, CqnPredicate filter) {
         long limit = topLevels.levels();
-        Map<Integer, GenreHierarchy> lookup = new HashMap<>();
+        Map<String, GenreHierarchy> lookup = new HashMap<>();
         Map<Object, Long> expandLevels = topLevels.expandLevels();
 
         CqnSelect getRoots = Select.from(GENRE_HIERARCHY).where(gh -> gh.parent_ID().isNull().and(filter));
@@ -220,9 +220,9 @@ private List<GenreHierarchy> topLevelsLimit(CqnTopLevelsTransformation topLevels
         roots.forEach(root -> {
             root.setDistanceFromRoot(0l);
             lookup.put(root.getId(), root);
-            List<Integer> parents = List.of(root.getId());
+            List<String> parents = List.of(root.getId());
             for (long i = 1; i < limit; i++) {
-                List<Integer> ps = parents;
+                List<String> ps = parents;
                 CqnSelect getChildren = Select.from(GENRE_HIERARCHY)
                         .where(gh -> gh.parent_ID().in(ps).and(filter));
                 List<GenreHierarchy> children = db.run(getChildren).listOf(GenreHierarchy.class);
@@ -239,8 +239,8 @@ private List<GenreHierarchy> topLevelsLimit(CqnTopLevelsTransformation topLevels
         });
 
         if (!expandLevels.isEmpty()) {
-            List<Integer> expandedIds = expandLevels.keySet().stream().map(key -> (Integer) key).toList();
-            CqnSelect expandedCQN = Select.from(AdminService_.GENRE_HIERARCHY).where(gh -> CQL.and(filter,
+            List<String> expandedIds = expandLevels.keySet().stream().map(key -> (String) key).toList();
+            CqnSelect expandedCQN = Select.from(CatalogService_.GENRE_HIERARCHY).where(gh -> CQL.and(filter,
                     CQL.or(gh.ID().in(expandedIds), gh.parent_ID().in(expandedIds))));
 
             List<GenreHierarchy> expanded = db.run(expandedCQN).listOf(GenreHierarchy.class);
diff --git a/srv/src/main/java/my/bookshop/handlers/HierarchySiblingActionHandler.java b/srv/src/main/java/my/bookshop/handlers/HierarchySiblingActionHandler.java
new file mode 100644
index 00000000..31f08b6c
--- /dev/null
+++ b/srv/src/main/java/my/bookshop/handlers/HierarchySiblingActionHandler.java
@@ -0,0 +1,75 @@
+package my.bookshop.handlers;
+
+import static cds.gen.adminservice.AdminService_.GENRE_HIERARCHY;
+
+import java.util.List;
+
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Component;
+
+import com.sap.cds.ql.CQL;
+import com.sap.cds.ql.Select;
+import com.sap.cds.ql.Update;
+import com.sap.cds.ql.cqn.CqnStructuredTypeRef;
+import com.sap.cds.services.handler.EventHandler;
+import com.sap.cds.services.handler.annotations.On;
+import com.sap.cds.services.handler.annotations.ServiceName;
+import com.sap.cds.services.persistence.PersistenceService;
+
+import cds.gen.adminservice.AdminService_;
+import cds.gen.adminservice.GenreHierarchy;
+import cds.gen.adminservice.GenreHierarchyMoveSiblingContext;
+import cds.gen.adminservice.GenreHierarchy_;
+
+@Component
+@ServiceName(AdminService_.CDS_NAME)
+/**
+ * Example of a custom handler for nextSiblingAction
+ */
+@Profile("cloud")
+public class HierarchySiblingActionHandler implements EventHandler {
+
+    private final PersistenceService db;
+
+    HierarchySiblingActionHandler(PersistenceService db) {
+        this.db = db;
+    }
+
+    @On(entity = GenreHierarchy_.CDS_NAME)
+    void onMoveSiblingAction(CqnStructuredTypeRef ref, GenreHierarchyMoveSiblingContext context) {
+        // Find current node and its parent
+        GenreHierarchy toMove = db.run(Select.from(CQL.entity(GENRE_HIERARCHY, ref))
+                .columns(c -> c.ID(), c -> c.parent_ID()))
+                .single(GenreHierarchy.class);
+
+        // Find all children of the parent, which are siblings of the entry being moved
+        List<GenreHierarchy> siblingNodes = db.run(Select.from(GENRE_HIERARCHY)
+                .columns(c -> c.ID(), c -> c.siblingRank())
+                .where(c -> c.parent_ID().eq(toMove.getParentId())))
+                .listOf(GenreHierarchy.class);
+
+        int oldPosition = 0;
+        int newPosition = siblingNodes.size();
+        for (int i = 0; i < siblingNodes.size(); ++i) {
+            GenreHierarchy sibling = siblingNodes.get(i);
+            if (sibling.getId().equals(toMove.getId())) {
+                oldPosition = i;
+            }
+            if (context.getNextSibling() != null && sibling.getId().equals(context.getNextSibling().getId())) {
+                newPosition = i;
+            }
+        }
+
+        // Move siblings
+        siblingNodes.add(oldPosition < newPosition ? newPosition - 1 : newPosition, siblingNodes.remove(oldPosition));
+
+        // Recalculate ranks
+        for (int i = 0; i < siblingNodes.size(); ++i) {
+            siblingNodes.get(i).setSiblingRank(i);
+        }
+
+        // Update DB
+        db.run(Update.entity(GENRE_HIERARCHY).entries(siblingNodes));
+        context.setCompleted();
+    }
+}
diff --git a/srv/src/test/java/my/bookshop/GenreHierarchyTest.java b/srv/src/test/java/my/bookshop/GenreHierarchyTest.java
index 90358c23..e005ff2a 100644
--- a/srv/src/test/java/my/bookshop/GenreHierarchyTest.java
+++ b/srv/src/test/java/my/bookshop/GenreHierarchyTest.java
@@ -27,7 +27,7 @@ public class GenreHierarchyTest {
 	@Autowired
 	Environment env;
 
-	private static final String genresURI = "/api/admin/GenreHierarchy";
+	private static final String genresURI = "/api/browse/GenreHierarchy";
 
 	@Test
 	@WithMockUser(username = "admin")
@@ -40,7 +40,7 @@ void testGetAll() throws Exception {
 	void testCountAll() throws Exception {
 		client.perform(get(genresURI + "/$count"))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$").value(30));
+				.andExpect(jsonPath("$").value(33));
 	}
 
 	@Test
@@ -52,11 +52,11 @@ void testStartOneLevel() throws Exception {
 				+ "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/GenreHierarchy,HierarchyQualifier='GenreHierarchy',NodeProperty='ID',Levels=1)"
 				+ "&$count=true"))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.value[0].ID").value(100))
+				.andExpect(jsonPath("$.value[0].ID").value("8bbf14c6-b378-4e35-9b4f-5a9c8b8762da"))
 				.andExpect(jsonPath("$.value[0].name").value("Fiction"))
 				.andExpect(jsonPath("$.value[0].DistanceFromRoot").value(0))
 				.andExpect(jsonPath("$.value[0].DrillState").value("collapsed"))
-				.andExpect(jsonPath("$.value[1].ID").value(200))
+				.andExpect(jsonPath("$.value[1].ID").value("85b5a640-7e9a-468e-80e2-e9268486031b"))
 				.andExpect(jsonPath("$.value[1].name").value("Non-Fiction"))
 				.andExpect(jsonPath("$.value[1].DistanceFromRoot").value(0))
 				.andExpect(jsonPath("$.value[1].DrillState").value("collapsed"))
@@ -72,19 +72,16 @@ void testStartTwoLevels() throws Exception {
 				+ "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/GenreHierarchy,HierarchyQualifier='GenreHierarchy',NodeProperty='ID',Levels=2)"
 				+ "&$count=true"))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.value[0].ID").value(100))
 				.andExpect(jsonPath("$.value[0].name").value("Fiction"))
 				.andExpect(jsonPath("$.value[0].DrillState").value("expanded"))
 				.andExpect(jsonPath("$.value[0].DistanceFromRoot").value(0))
-				.andExpect(jsonPath("$.value[1].ID").value(101))
 				.andExpect(jsonPath("$.value[1].name").value("Action"))
 				.andExpect(jsonPath("$.value[1].DrillState").value("leaf"))
 				.andExpect(jsonPath("$.value[1].DistanceFromRoot").value(1))
-				.andExpect(jsonPath("$.value[20].ID").value(204))
-				.andExpect(jsonPath("$.value[20].name").value("Speech"))
-				.andExpect(jsonPath("$.value[20].DrillState").value("leaf"))
-				.andExpect(jsonPath("$.value[20].DistanceFromRoot").value(1))
-				.andExpect(jsonPath("$.value[21]").doesNotExist());
+				.andExpect(jsonPath("$.value[21].name").value("Speech"))
+				.andExpect(jsonPath("$.value[21].DrillState").value("leaf"))
+				.andExpect(jsonPath("$.value[21].DistanceFromRoot").value(1))
+				.andExpect(jsonPath("$.value[22]").doesNotExist());
 	}
 
 	@Test
@@ -92,16 +89,13 @@ void testStartTwoLevels() throws Exception {
 	void testExpandNonFiction() throws Exception {
 		client.perform(get(genresURI
 				+ "?$select=DrillState,ID,name"
-				+ "&$apply=descendants($root/GenreHierarchy,GenreHierarchy,ID,filter(ID eq 200),1)"
+				+ "&$apply=descendants($root/GenreHierarchy,GenreHierarchy,ID,filter(ID eq 85b5a640-7e9a-468e-80e2-e9268486031b),1)"
 				+ "/orderby(ID)"))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.value[0].ID").value(201))
 				.andExpect(jsonPath("$.value[0].name").value("Biography"))
 				.andExpect(jsonPath("$.value[0].DrillState").value("collapsed"))
-				.andExpect(jsonPath("$.value[1].ID").value(203))
 				.andExpect(jsonPath("$.value[1].name").value("Essay"))
 				.andExpect(jsonPath("$.value[1].DrillState").value("leaf"))
-				.andExpect(jsonPath("$.value[2].ID").value(204))
 				.andExpect(jsonPath("$.value[2].name").value("Speech"))
 				.andExpect(jsonPath("$.value[2].DrillState").value("leaf"))
 				.andExpect(jsonPath("$.value[3]").doesNotExist());
@@ -132,13 +126,12 @@ void testExpandAll() throws Exception {
 
 		ResultActions expectations = client.perform(get(url))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.value[0].ID").value(100))
 				.andExpect(jsonPath("$.value[0].name").value("Fiction"))
 				.andExpect(jsonPath("$.value[0].DrillState").value("expanded"))
 				.andExpect(jsonPath("$.value[0].DistanceFromRoot").value(0))
-				.andExpect(jsonPath("$.value[29].name").value("Speech"))
-				.andExpect(jsonPath("$.value[29].DrillState").value("leaf"))
-				.andExpect(jsonPath("$.value[30]").doesNotExist());
+				.andExpect(jsonPath("$.value[32].name").value("Speech"))
+				.andExpect(jsonPath("$.value[32].DrillState").value("leaf"))
+				.andExpect(jsonPath("$.value[33]").doesNotExist());
 		if (isOnHana()) {
 			expectations.andExpect(jsonPath("$.value[0].LimitedDescendantCount").value(24));
 		}
@@ -154,19 +147,21 @@ void testSearch() throws Exception {
 				+ "/com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/GenreHierarchy,HierarchyQualifier='GenreHierarchy',NodeProperty='ID')"
 				+ "&$count=true"))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.value[0].ID").value(100))
 				.andExpect(jsonPath("$.value[0].name").value("Fiction"))
 				.andExpect(jsonPath("$.value[0].DrillState").value("expanded"))
 				.andExpect(jsonPath("$.value[0].DistanceFromRoot").value(0))
-				.andExpect(jsonPath("$.value[1].ID").value(120))
 				.andExpect(jsonPath("$.value[1].name").value("Contemporary Fiction"))
 				.andExpect(jsonPath("$.value[1].DrillState").value("leaf"))
 				.andExpect(jsonPath("$.value[1].DistanceFromRoot").value(1))
-				.andExpect(jsonPath("$.value[2].ID").value(128))
 				.andExpect(jsonPath("$.value[2].name").value("Fairy Tale"))
 				.andExpect(jsonPath("$.value[2].DrillState").value("leaf"))
 				.andExpect(jsonPath("$.value[2].DistanceFromRoot").value(1))
-				.andExpect(jsonPath("$.value[3].ID").value(122))
+				.andExpect(jsonPath("$.value[3].name").value("Literary Fiction"))
+				.andExpect(jsonPath("$.value[3].DrillState").value("leaf"))
+				.andExpect(jsonPath("$.value[4].name").value("Mystery"))
+				.andExpect(jsonPath("$.value[4].DrillState").value("leaf"))
+				.andExpect(jsonPath("$.value[5].name").value("Poetry"))
+				.andExpect(jsonPath("$.value[5].DrillState").value("leaf"))
 				.andExpect(jsonPath("$.value[6].name").value("Short Story"))
 				.andExpect(jsonPath("$.value[6].DrillState").value("leaf"))
 				.andExpect(jsonPath("$.value[6].DistanceFromRoot").value(1))
@@ -188,7 +183,6 @@ void testFilterNotExpanded() throws Exception {
 				+ "&$apply=ancestors($root/GenreHierarchy,GenreHierarchy,ID,filter(name eq 'Autobiography'),keep start)/orderby(name)"
 				+ "/com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/GenreHierarchy,HierarchyQualifier='GenreHierarchy',NodeProperty='ID',Levels=1)"))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.value[0].ID").value(200))
 				.andExpect(jsonPath("$.value[0].name").value("Non-Fiction"))
 				.andExpect(jsonPath("$.value[0].DrillState").value("collapsed"))
 				.andExpect(jsonPath("$.value[0].DistanceFromRoot").value(0))
@@ -199,7 +193,7 @@ void testFilterNotExpanded() throws Exception {
 	@WithMockUser(username = "admin")
 	void testFilterExpandLevels() throws Exception {
 		String expandLevelsJson = """
-				[{"NodeID":100,"Levels":1},{"NodeID":200,"Levels":1}]\
+				[{"NodeID":"8bbf14c6-b378-4e35-9b4f-5a9c8b8762da","Levels":1},{"NodeID":"85b5a640-7e9a-468e-80e2-e9268486031b","Levels":1}]\
 				""";
 		String unencoded = genresURI + "?$select=DistanceFromRoot,DrillState,ID,LimitedDescendantCount,name"
 				+ "&$apply=ancestors($root/GenreHierarchy,GenreHierarchy,ID,filter(name eq 'Autobiography'),keep start)/orderby(name)"
@@ -209,7 +203,6 @@ void testFilterExpandLevels() throws Exception {
 		URI uri = URI.create(uriString);
 		client.perform(get(uri))
 				.andExpect(status().isOk())
-				.andExpect(jsonPath("$.value[0].ID").value(200))
 				.andExpect(jsonPath("$.value[0].name").value("Non-Fiction"))
 				.andExpect(jsonPath("$.value[0].DrillState").value("expanded"))
 				.andExpect(jsonPath("$.value[0].DistanceFromRoot").value(0))
@@ -226,14 +219,14 @@ void testStartTwoLevelsOrderByDescHANA() throws Exception {
 					+ "com.sap.vocabularies.Hierarchy.v1.TopLevels(HierarchyNodes=$root/GenreHierarchy,HierarchyQualifier='GenreHierarchy',NodeProperty='ID',Levels=2)"
 					+ "&$count=true"))
 					.andExpect(status().isOk())
-					.andExpect(jsonPath("$.value[0].ID").value(200))
-					.andExpect(jsonPath("$.value[1].ID").value(204))
-					.andExpect(jsonPath("$.value[20].ID").value(101))
-					.andExpect(jsonPath("$.value[21]").doesNotExist());
+					.andExpect(jsonPath("$.value[0].name").value("Non-Fiction"))
+					.andExpect(jsonPath("$.value[1].name").value("Speech"))
+					.andExpect(jsonPath("$.value[21].name").value("Action"))
+					.andExpect(jsonPath("$.value[22]").doesNotExist());
 		}
 	}
 
 	private boolean isOnHana() {
 		return env.acceptsProfiles(Profiles.of("cloud"));
 	}
-}
+}
\ No newline at end of file
diff --git a/srv/src/test/java/my/bookshop/handlers/HierarchyHandlerSorterTest.java b/srv/src/test/java/my/bookshop/handlers/HierarchyHandlerSorterTest.java
index 46bc78c2..57ea139d 100644
--- a/srv/src/test/java/my/bookshop/handlers/HierarchyHandlerSorterTest.java
+++ b/srv/src/test/java/my/bookshop/handlers/HierarchyHandlerSorterTest.java
@@ -4,7 +4,7 @@
 import java.util.List;
 import org.junit.jupiter.api.Test;
 
-import cds.gen.adminservice.GenreHierarchy;
+import cds.gen.catalogservice.GenreHierarchy;
 import my.bookshop.handlers.HierarchyHandler.Sorter;
 
 public class HierarchyHandlerSorterTest {