diff --git a/package-lock.json b/package-lock.json
index 4d0eb092..9f676278 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -28,7 +28,6 @@
       }
     },
     "bookshop": {
-      "name": "@capire/bookshop",
       "version": "1.0.0",
       "dependencies": {
         "@capire/common": "*",
@@ -38,14 +37,12 @@
       }
     },
     "common": {
-      "name": "@capire/common",
       "version": "1.0.0",
       "dependencies": {
         "@sap/cds": "*"
       }
     },
     "fiori": {
-      "name": "@capire/fiori",
       "version": "1.0.0",
       "dependencies": {
         "@capire/bookshop": "*",
@@ -67,8 +64,13 @@
         "typescript": "^4.3.5"
       }
     },
+    "hello/node_modules/@types/node": {
+      "version": "15.14.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.2.tgz",
+      "integrity": "sha512-dvMUE/m2LbXPwlvVuzCyslTEtQ2ZwuuFClDrOQ6mp2CenCg971719PTILZ4I6bTP27xfFFc+o7x2TkLuun/MPw==",
+      "dev": true
+    },
     "media": {
-      "name": "@capire/media",
       "version": "1.0.0",
       "dependencies": {
         "lokijs": "^1.5.6"
@@ -1175,9 +1177,9 @@
       }
     },
     "node_modules/@sap/cds": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-5.3.0.tgz",
-      "integrity": "sha512-41IMft4ovC36etCLeVP2iQRdh8OLP2yA8fKPzqHznXfZ1FdHy3KVUGT71vAakIAwPXQIHfyUz8/tKZqNnyAQ/Q==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-5.3.1.tgz",
+      "integrity": "sha512-TKHs+xGTZAgLixGyl+19O6BUuK0MSEWm/zj5j++AucmRep8EkURRsf004HEvydOpoQEiHBCuRsqKoKdivfCTdg==",
       "dependencies": {
         "@sap-cloud-sdk/core": "^1.41",
         "@sap-cloud-sdk/util": "^1.41",
@@ -12131,9 +12133,9 @@
       }
     },
     "node_modules/@types/node": {
-      "version": "15.14.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.2.tgz",
-      "integrity": "sha512-dvMUE/m2LbXPwlvVuzCyslTEtQ2ZwuuFClDrOQ6mp2CenCg971719PTILZ4I6bTP27xfFFc+o7x2TkLuun/MPw=="
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.1.tgz",
+      "integrity": "sha512-N87VuQi7HEeRJkhzovao/JviiqKjDKMVKxKMfUvSKw+MbkbW8R0nA3fi/MQhhlxV2fQ+2ReM+/Nt4efdrJx3zA=="
     },
     "node_modules/@types/prettier": {
       "version": "2.3.2",
@@ -12406,8 +12408,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
       "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true,
-      "optional": true,
       "engines": {
         "node": ">=0.8"
       }
@@ -12739,9 +12739,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001243",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz",
-      "integrity": "sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA==",
+      "version": "1.0.30001244",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001244.tgz",
+      "integrity": "sha512-Wb4UFZPkPoJoKKVfELPWytRzpemjP/s0pe22NriANru1NoI+5bGNxzKtk7edYL8rmCWTfQO8eRiF0pn1Dqzx7Q==",
       "dev": true,
       "peer": true,
       "funding": {
@@ -13357,9 +13357,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.772",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.772.tgz",
-      "integrity": "sha512-X/6VRCXWALzdX+RjCtBU6cyg8WZgoxm9YA02COmDOiNJEZ59WkQggDbWZ4t/giHi/3GS+cvdrP6gbLISANAGYA==",
+      "version": "1.3.774",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.774.tgz",
+      "integrity": "sha512-Fggh17Q1yyv1uMzq8Qn1Ci58P50qcRXMXd2MBcB9sxo6rJxjUutWcNw8uCm3gFWMdcblBO6mDT5HzX/RVRRECA==",
       "dev": true,
       "peer": true
     },
@@ -13670,11 +13670,9 @@
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
       "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
       "engines": [
         "node >=0.6.0"
-      ],
-      "optional": true
+      ]
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
@@ -14341,9 +14339,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
+      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
       "dev": true,
       "peer": true,
       "dependencies": {
@@ -16520,9 +16518,9 @@
       }
     },
     "node_modules/object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw==",
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -17941,11 +17939,9 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
       "engines": [
         "node >=0.6.0"
       ],
-      "optional": true,
       "dependencies": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -18213,7 +18209,6 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
       "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
       "dev": true,
-      "peer": true,
       "engines": {
         "node": ">=8.3.0"
       },
@@ -18337,14 +18332,12 @@
       }
     },
     "orders": {
-      "name": "@capire/orders",
       "version": "1.0.0",
       "dependencies": {
         "@sap/cds": "^5"
       }
     },
     "reviews": {
-      "name": "@capire/reviews",
       "version": "1.0.0",
       "dependencies": {
         "@sap/cds": "^5",
@@ -18930,6 +18923,14 @@
         "@types/node": "^15.12.0",
         "ts-jest": "^27.0.2",
         "typescript": "^4.3.5"
+      },
+      "dependencies": {
+        "@types/node": {
+          "version": "15.14.2",
+          "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.2.tgz",
+          "integrity": "sha512-dvMUE/m2LbXPwlvVuzCyslTEtQ2ZwuuFClDrOQ6mp2CenCg971719PTILZ4I6bTP27xfFFc+o7x2TkLuun/MPw==",
+          "dev": true
+        }
       }
     },
     "@capire/media": {
@@ -19255,9 +19256,9 @@
       }
     },
     "@sap/cds": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-5.3.0.tgz",
-      "integrity": "sha512-41IMft4ovC36etCLeVP2iQRdh8OLP2yA8fKPzqHznXfZ1FdHy3KVUGT71vAakIAwPXQIHfyUz8/tKZqNnyAQ/Q==",
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/@sap/cds/-/cds-5.3.1.tgz",
+      "integrity": "sha512-TKHs+xGTZAgLixGyl+19O6BUuK0MSEWm/zj5j++AucmRep8EkURRsf004HEvydOpoQEiHBCuRsqKoKdivfCTdg==",
       "requires": {
         "@sap-cloud-sdk/core": "^1.41",
         "@sap-cloud-sdk/util": "^1.41",
@@ -27169,9 +27170,9 @@
       }
     },
     "@types/node": {
-      "version": "15.14.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-15.14.2.tgz",
-      "integrity": "sha512-dvMUE/m2LbXPwlvVuzCyslTEtQ2ZwuuFClDrOQ6mp2CenCg971719PTILZ4I6bTP27xfFFc+o7x2TkLuun/MPw=="
+      "version": "16.3.1",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.3.1.tgz",
+      "integrity": "sha512-N87VuQi7HEeRJkhzovao/JviiqKjDKMVKxKMfUvSKw+MbkbW8R0nA3fi/MQhhlxV2fQ+2ReM+/Nt4efdrJx3zA=="
     },
     "@types/prettier": {
       "version": "2.3.2",
@@ -27390,9 +27391,7 @@
     "assert-plus": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
-      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU="
     },
     "assertion-error": {
       "version": "1.1.0",
@@ -27657,9 +27656,9 @@
       "peer": true
     },
     "caniuse-lite": {
-      "version": "1.0.30001243",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001243.tgz",
-      "integrity": "sha512-vNxw9mkTBtkmLFnJRv/2rhs1yufpDfCkBZexG3Y0xdOH2Z/eE/85E4Dl5j1YUN34nZVsSp6vVRFQRrez9wJMRA==",
+      "version": "1.0.30001244",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001244.tgz",
+      "integrity": "sha512-Wb4UFZPkPoJoKKVfELPWytRzpemjP/s0pe22NriANru1NoI+5bGNxzKtk7edYL8rmCWTfQO8eRiF0pn1Dqzx7Q==",
       "dev": true,
       "peer": true
     },
@@ -28162,9 +28161,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "electron-to-chromium": {
-      "version": "1.3.772",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.772.tgz",
-      "integrity": "sha512-X/6VRCXWALzdX+RjCtBU6cyg8WZgoxm9YA02COmDOiNJEZ59WkQggDbWZ4t/giHi/3GS+cvdrP6gbLISANAGYA==",
+      "version": "1.3.774",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.774.tgz",
+      "integrity": "sha512-Fggh17Q1yyv1uMzq8Qn1Ci58P50qcRXMXd2MBcB9sxo6rJxjUutWcNw8uCm3gFWMdcblBO6mDT5HzX/RVRRECA==",
       "dev": true,
       "peer": true
     },
@@ -28400,9 +28399,7 @@
     "extsprintf": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
-      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
-      "dev": true,
-      "optional": true
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU="
     },
     "fast-deep-equal": {
       "version": "3.1.3",
@@ -28902,9 +28899,9 @@
       }
     },
     "is-core-module": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.4.0.tgz",
-      "integrity": "sha512-6A2fkfq1rfeQZjxrZJGerpLCTHRNEBiSgnu0+obeJpEPZRUooHgsizvzv0ZjJwOz3iWIHdJtVWJ/tmPr3D21/A==",
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
+      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
       "dev": true,
       "peer": true,
       "requires": {
@@ -30625,9 +30622,9 @@
       "dev": true
     },
     "object-inspect": {
-      "version": "1.10.3",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.10.3.tgz",
-      "integrity": "sha512-e5mCJlSH7poANfC8z8S9s9S2IN5/4Zb3aZ33f5s8YqoazCFzNLloLU8r5VCG+G7WoqLvAAZoVMcy3tp/3X0Plw=="
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.11.0.tgz",
+      "integrity": "sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg=="
     },
     "object-keys": {
       "version": "1.1.1",
@@ -31722,8 +31719,6 @@
       "version": "1.10.0",
       "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
       "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
-      "dev": true,
-      "optional": true,
       "requires": {
         "assert-plus": "^1.0.0",
         "core-util-is": "1.0.2",
@@ -31950,7 +31945,6 @@
       "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.3.tgz",
       "integrity": "sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==",
       "dev": true,
-      "peer": true,
       "requires": {}
     },
     "xml-name-validator": {