diff --git a/packages/builder/src/components/start/AppCard.svelte b/packages/builder/src/components/start/AppCard.svelte
index f4dac1dc6c..4efc298cdd 100644
--- a/packages/builder/src/components/start/AppCard.svelte
+++ b/packages/builder/src/components/start/AppCard.svelte
@@ -14,7 +14,9 @@
   async function exportApp() {
     appExportLoading = true
     try {
-      download(`/api/backups/export?appId=${_id}&appname=${name}`)
+      download(
+        `/api/backups/export?appId=${_id}&appname=${encodeURIComponent(name)}`
+      )
       notifier.success("App Export Complete.")
     } catch (err) {
       console.error(err)
@@ -30,13 +32,13 @@
   <Spacer medium />
   <div class="card-footer">
     <TextButton text medium blue href="/_builder/{_id}">
-      Open
-      {name}
-      →
+      Open {name} →
     </TextButton>
     {#if appExportLoading}
       <Spinner size="10" />
-    {:else}<i class="ri-folder-download-line" on:click={exportApp} />{/if}
+    {:else}
+      <i class="ri-folder-download-line" on:click={exportApp} />
+    {/if}
   </div>
 </div>
 
diff --git a/packages/client/package.json b/packages/client/package.json
index 4ba1845f84..81504ceb06 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -30,5 +30,5 @@
     "svelte": "^3.30.0",
     "svelte-jester": "^1.0.6"
   },
-  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491"
+  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
 }
diff --git a/packages/server/package.json b/packages/server/package.json
index 9bda59d551..424f6c36de 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -120,5 +120,5 @@
       "./scripts/jestSetup.js"
     ]
   },
-  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491"
+  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
 }
diff --git a/packages/server/src/api/controllers/backup.js b/packages/server/src/api/controllers/backup.js
index c8bcafcb7c..a83f96165b 100644
--- a/packages/server/src/api/controllers/backup.js
+++ b/packages/server/src/api/controllers/backup.js
@@ -4,7 +4,9 @@ const os = require("os")
 const fs = require("fs-extra")
 
 exports.exportAppDump = async function(ctx) {
-  const { appId, appname } = ctx.query
+  const { appId } = ctx.query
+
+  const appname = decodeURI(ctx.query.appname)
 
   const backupsDir = path.join(os.homedir(), ".budibase", "backups")
   fs.ensureDirSync(backupsDir)
diff --git a/packages/standard-components/package.json b/packages/standard-components/package.json
index 61697d8e9c..5d8889f21d 100644
--- a/packages/standard-components/package.json
+++ b/packages/standard-components/package.json
@@ -36,7 +36,7 @@
   ],
   "version": "0.7.3",
   "license": "MIT",
-  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491",
+  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd",
   "dependencies": {
     "@budibase/bbui": "^1.55.1",
     "@budibase/svelte-ag-grid": "^0.0.16",
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 4fcf45aa36..2b4fbcbaee 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -32,5 +32,6 @@
     "rollup-plugin-node-resolve": "^5.2.0",
     "rollup-plugin-terser": "^7.0.2",
     "typescript": "^4.1.3"
-  }
+  },
+  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
 }
diff --git a/packages/worker/package.json b/packages/worker/package.json
index fb0097fd0c..cae7411659 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -34,5 +34,5 @@
     "pouchdb-all-dbs": "^1.0.2",
     "server-destroy": "^1.0.1"
   },
-  "gitHead": "62ebf3cedcd7e9b2494b4f8cbcfb90927609b491"
+  "gitHead": "1a80b09fd093f2599a68f7db72ad639dd50922dd"
 }