diff --git a/bookshop/srv/admin-service.cds b/bookshop/srv/admin-service.cds
index fa904dc2..9514c842 100644
--- a/bookshop/srv/admin-service.cds
+++ b/bookshop/srv/admin-service.cds
@@ -7,5 +7,6 @@ service AdminService @(requires:'admin', path:'/admin') {
   entity Books          as projection on my.Books;
   entity Authors        as projection on my.Authors;
   @readonly
+  @cds.search: {name}
   entity GenreHierarchy as projection on my.Genres
 }
diff --git a/bookshop/srv/hierarchy.cds b/bookshop/srv/hierarchy.cds
index f6619d98..963888e4 100644
--- a/bookshop/srv/hierarchy.cds
+++ b/bookshop/srv/hierarchy.cds
@@ -1,12 +1,12 @@
 namespace my.common;
 
 aspect Hierarchy {
-  virtual LimitedDescendantCount : Integer64;
-  virtual DistanceFromRoot       : Integer64;
-  virtual DrillState             : String;
-  virtual Matched                : Boolean;
-  virtual MatchedDescendantCount : Integer64;
-  virtual LimitedRank            : Integer64;
+  LimitedDescendantCount : Integer64 = null;
+  DistanceFromRoot       : Integer64 = null;
+  DrillState             : String = null;
+  Matched                : Boolean = null;
+  MatchedDescendantCount : Integer64 = null;
+  LimitedRank            : Integer64 = null;
 }