diff --git a/media-store/app/src/api/axiosInstance.js b/media-store/app/src/api/axiosInstance.js
index abde261a..d1fc2f2c 100644
--- a/media-store/app/src/api/axiosInstance.js
+++ b/media-store/app/src/api/axiosInstance.js
@@ -16,6 +16,6 @@ const locale = getLocaleFromLS();
 changeUserDefaults(user);
 changeLocaleDefaults(locale);
 
-axiosInstance.interceptors.response.use(null, responseErrorInterceptor);
+// axiosInstance.interceptors.response.use(null, responseErrorInterceptor);
 
 export { axiosInstance, changeLocaleDefaults, changeUserDefaults };
diff --git a/media-store/app/src/pages/ErrorPage.js b/media-store/app/src/pages/ErrorPage.js
index 060efd5e..584c9058 100644
--- a/media-store/app/src/pages/ErrorPage.js
+++ b/media-store/app/src/pages/ErrorPage.js
@@ -40,11 +40,6 @@ const ErrorPage = () => {
           <Button onClick={onGoHome} type="primary">
             Back Home
           </Button>
-          {!user && (
-            <Button onClick={goLoginPage} type="primary">
-              Login
-            </Button>
-          )}
         </>
       }
     />
diff --git a/media-store/srv/manage-store-service.js b/media-store/srv/manage-store-service.js
index 66a826f5..43f5f77b 100644
--- a/media-store/srv/manage-store-service.js
+++ b/media-store/srv/manage-store-service.js
@@ -4,14 +4,22 @@ module.exports = async function () {
   const db = await cds.connect.to("db"); // connect to database service
 
   this.on("CREATE", "*", async (req) => {
+    const selectLastQuery = SELECT.one(req.entity)
+    .orderBy({ ID: "desc" });
+
     const transaction = await db.tx(req);
-    let { ID: lastEntityID } = await transaction.run(
-      SELECT.one(req.entity).columns("ID").orderBy({ ID: "desc" })
-    );
+
+    let { ID: lastEntityID } = await transaction.run(selectLastQuery);
+
     const columns = ["ID", ...Object.keys(req.data)];
     const values = [++lastEntityID, ...Object.values(req.data)];
+    const insertQuery = INSERT.into(req.entity).columns(columns).values(values);
+
+    await transaction.run(insertQuery);
+    const result = await transaction.run(selectLastQuery);
 
-    await transaction.run(req.query.columns(columns).values(values));
     await transaction.commit();
+
+    return result;
   });
 };