diff --git a/media-store/db/data/sap.capire.media.store-Genres_texts.csv b/media-store/db/data/sap.capire.media.store-Genres_texts.csv
new file mode 100644
index 00000000..133eae12
--- /dev/null
+++ b/media-store/db/data/sap.capire.media.store-Genres_texts.csv
@@ -0,0 +1,76 @@
+ID;locale;name
+1;ru;Рок
+1;fr;Roche
+1;de;Felsen
+2;ru;Джаз
+2;fr;le jazz
+2;de;Jazz
+3;ru;Металл
+3;fr;Métal
+3;de;Metall
+4;ru;Альтернатива и панк
+4;fr;Alternatif et punk
+4;de;Alternative & Punk
+5;ru;Рок-н-ролл
+5;fr;Rock and roll
+5;de;Rock'n'Roll
+6;ru;Блюз
+6;fr;Blues
+6;de;Blues
+7;ru;Латинский
+7;fr;Latine
+7;de;Latein
+8;ru;Регги
+8;fr;Reggae
+8;de;Reggae
+9;ru;Поп
+9;fr;Pop
+9;de;Pop
+10;ru;Саундтрек
+10;fr;Bande sonore
+10;de;Soundtrack
+11;ru;Босса-нова
+11;fr;Bossa Nova
+11;de;Bossa Nova
+12;ru;Легко слушать
+12;fr;Écoute facile
+12;de;Einfaches Zuhören
+13;ru;Тяжелый металл
+13;fr;Heavy métal
+13;de;Einfaches Zuhören
+14;ru;R&B / Соул 
+14;fr;R&B / Soul
+14;de;R&B / Soul
+15;ru;Электроника / Танцы
+15;fr;Électronique / danse
+15;de;Elektronisch / Tanz
+16;ru;Мир
+16;fr;Monde
+16;de;Welt
+17;ru;Хип-хоп / рэп
+17;fr;Hip-hop / Rap
+17;de;Hip Hop / Rap
+18;ru;Научная фантастика
+18;fr;Science fiction
+18;de;Science-Fiction
+19;ru;ТВ шоу
+19;fr;Émissions de télévision
+19;de;Fernsehshows
+20;ru;Научная фантастика и фэнтези
+20;fr;Science-fiction et fantastique
+20;de;Sci Fi & Fantasy
+21;ru;Драма
+21;fr;Drame
+21;de;Theater
+22;ru;Комедия
+22;fr;La comédie
+22;de;Komödie
+23;ru;Альтернатива
+23;fr;Alternative
+23;de;Alternative
+24;ru;Классический
+24;fr;Classique
+24;de;Klassik
+25;ru;Опера
+25;fr;Opéra
+25;de;Oper
\ No newline at end of file
diff --git a/media-store/db/schema.cds b/media-store/db/schema.cds
index 5e00473d..4f9261f5 100644
--- a/media-store/db/schema.cds
+++ b/media-store/db/schema.cds
@@ -5,7 +5,7 @@ aspect Named {
     name   : String(120);
 }
 
-aspect Persone {
+aspect Person {
     key ID     : Integer;
     lastName   : String(20);
     firstName  : String(40);
@@ -46,7 +46,7 @@ entity Albums {
                      on tracks.album = $self;
 }
 
-entity Employees : Persone {
+entity Employees : Person {
     reportsTo    : Association to Employees;
     title        : String(20);
     birthDate    : DateTime;
@@ -55,7 +55,7 @@ entity Employees : Persone {
                        on subordinates.reportsTo = $self;
 }
 
-entity Customers : Persone {
+entity Customers : Person {
     company    : String(80);
     supportRep : Association to Employees;
     invoices   : Association to many Invoices
diff --git a/media-store/server.js b/media-store/server.js
index 4a0a59d5..09d130e2 100644
--- a/media-store/server.js
+++ b/media-store/server.js
@@ -10,7 +10,7 @@ cds.on("bootstrap", (app) => {
     );
     res.header(
       "Access-Control-Allow-Headers",
-      "Origin, X-Requested-With, Content-Type, Accept, Authorization"
+      "Origin, X-Requested-With, Content-Type, Accept, Authorization, Accept-Language"
     );
 
     //intercepts OPTIONS method
diff --git a/media-store/srv/manage-tracks-service.js b/media-store/srv/manage-tracks-service.js
deleted file mode 100644
index f7357baf..00000000
--- a/media-store/srv/manage-tracks-service.js
+++ /dev/null
@@ -1,7 +0,0 @@
-const cds = require("@sap/cds");
-
-module.exports = async function () {
-  this.before("*", async (req) => {
-    req.user.locale = "fr";
-  });
-};
diff --git a/media-store/srv/user-service.cds b/media-store/srv/user-service.cds
index 9b24345d..ba56c24b 100644
--- a/media-store/srv/user-service.cds
+++ b/media-store/srv/user-service.cds
@@ -32,7 +32,7 @@ service Users {
         roles       : array of String(111);
         level       : Integer;
         mockedToken : String(500);
-        email       : my.Persone.email;
-        ID          : my.Persone.ID
+        email       : my.Person.email;
+        ID          : my.Person.ID
     };
 }