diff --git a/.changeset/happy-colts-cough.md b/.changeset/happy-colts-cough.md
new file mode 100644
index 000000000..ba0634057
--- /dev/null
+++ b/.changeset/happy-colts-cough.md
@@ -0,0 +1,5 @@
+---
+"saleor-app-search": patch
+---
+
+Refactor: Migrated private metadata of the app (used for settings) - previously each setting was saved in a dedicated metadata key. Now entire config is kept as JSON in a single field. This is non-breaking change - app will fallback to old config if needed.
diff --git a/.changeset/kind-wombats-beg.md b/.changeset/kind-wombats-beg.md
new file mode 100644
index 000000000..21ecb41b6
--- /dev/null
+++ b/.changeset/kind-wombats-beg.md
@@ -0,0 +1,5 @@
+---
+"saleor-app-search": patch
+---
+
+Refactor: Extracted shared webhook logic, like clients creation and settings fetching to a shared function that creates entire context. Webhook handlers LoC decreased by half
diff --git a/.changeset/metal-worms-double.md b/.changeset/metal-worms-double.md
new file mode 100644
index 000000000..0578a0bed
--- /dev/null
+++ b/.changeset/metal-worms-double.md
@@ -0,0 +1,5 @@
+---
+"saleor-app-search": minor
+---
+
+Added "Saleor Commerce" as an author in the Manifest
diff --git a/apps/search/src/pages/api/manifest.ts b/apps/search/src/pages/api/manifest.ts
index 94d4b5e89..288f90c27 100644
--- a/apps/search/src/pages/api/manifest.ts
+++ b/apps/search/src/pages/api/manifest.ts
@@ -40,6 +40,7 @@ export default createManifestHandler({
       tokenTargetUrl: `${apiBaseURL}/api/register`,
       version: packageJson.version,
       webhooks: appWebhooks.map((w) => w.getWebhookManifest(apiBaseURL)),
+      author: "Saleor Commerce",
     };
 
     return manifest;