diff --git a/fiori/app/_i18n/i18n_en.properties b/fiori/app/_i18n/i18n_en.properties
index 5d164a34..809011ad 100644
--- a/fiori/app/_i18n/i18n_en.properties
+++ b/fiori/app/_i18n/i18n_en.properties
@@ -1,7 +1,7 @@
 Age = Age
 Lifetime = Lifetime
 
-SubGenres = Sub Genres
+SubGenres = Subgenre
 
 NumCode = Numeric Code
 MinorUnit = Minor Unit
diff --git a/fiori/app/admin-books/fiori-service.cds b/fiori/app/admin-books/fiori-service.cds
index 48de172c..431f23ee 100644
--- a/fiori/app/admin-books/fiori-service.cds
+++ b/fiori/app/admin-books/fiori-service.cds
@@ -74,7 +74,7 @@ annotate AdminService.GenreHierarchy with @UI: {
     LineItem               : [{
         $Type: 'UI.DataField',
         Value: name,
-        Label : 'Genre'
+        Label :'{i18n>Name}'
     }],
 };
 
diff --git a/fiori/app/common.cds b/fiori/app/common.cds
index f14439ea..f9cbdea0 100644
--- a/fiori/app/common.cds
+++ b/fiori/app/common.cds
@@ -74,18 +74,15 @@ annotate my.Books with {
 //	Genres List
 //
 annotate my.Genres with @(
-  Common.SemanticKey : [name],
-  UI                 : {
-    SelectionFields : [name],
-    LineItem        : [
-      { Value: name },
-      {
-        Value : name,
-        // TODO: i18n 
-        Label: 'Main Genre'
-      },
-    ],
-  }
+    Common.SemanticKey : [name],
+    UI : {
+        SelectionFields : [name],
+        LineItem : [
+            {Value : name,
+            Label : '{i18n>Name}',
+            },
+        ],
+    }
 );
 
 annotate my.Genres with {
diff --git a/fiori/app/genres/webapp/manifest.json b/fiori/app/genres/webapp/manifest.json
index 1287713b..b6aae72b 100644
--- a/fiori/app/genres/webapp/manifest.json
+++ b/fiori/app/genres/webapp/manifest.json
@@ -3,7 +3,7 @@
   "sap.app": {
     "id": "genres",
     "type": "application",
-    "title": "Browse genres",
+    "title": "{{appTitle}}",
     "description": "Sample Application",
     "i18n": "i18n/i18n.properties",
     "applicationVersion": {