diff --git a/lerna.json b/lerna.json
index 102c63289a..6fe35bbe12 100644
--- a/lerna.json
+++ b/lerna.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.0.89-alpha.0",
+  "version": "1.0.90",
   "npmClient": "yarn",
   "packages": [
     "packages/*"
diff --git a/packages/backend-core/package.json b/packages/backend-core/package.json
index 5b3a6a83f8..6c766c9375 100644
--- a/packages/backend-core/package.json
+++ b/packages/backend-core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/backend-core",
-  "version": "1.0.89-alpha.0",
+  "version": "1.0.90",
   "description": "Budibase backend core libraries used in server and worker",
   "main": "src/index.js",
   "author": "Budibase",
diff --git a/packages/bbui/package.json b/packages/bbui/package.json
index 7033e9dd2c..40cf945bc1 100644
--- a/packages/bbui/package.json
+++ b/packages/bbui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/bbui",
   "description": "A UI solution used in the different Budibase projects.",
-  "version": "1.0.89-alpha.0",
+  "version": "1.0.90",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "module": "dist/bbui.es.js",
@@ -38,7 +38,7 @@
   ],
   "dependencies": {
     "@adobe/spectrum-css-workflow-icons": "^1.2.1",
-    "@budibase/string-templates": "^1.0.89-alpha.0",
+    "@budibase/string-templates": "^1.0.90",
     "@spectrum-css/actionbutton": "^1.0.1",
     "@spectrum-css/actiongroup": "^1.0.1",
     "@spectrum-css/avatar": "^3.0.2",
diff --git a/packages/builder/package.json b/packages/builder/package.json
index 5ce35d5dd2..854f6d5791 100644
--- a/packages/builder/package.json
+++ b/packages/builder/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/builder",
-  "version": "1.0.89-alpha.0",
+  "version": "1.0.90",
   "license": "GPL-3.0",
   "private": true,
   "scripts": {
@@ -65,10 +65,10 @@
     }
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.89-alpha.0",
-    "@budibase/client": "^1.0.89-alpha.0",
-    "@budibase/frontend-core": "^1.0.89-alpha.0",
-    "@budibase/string-templates": "^1.0.89-alpha.0",
+    "@budibase/bbui": "^1.0.90",
+    "@budibase/client": "^1.0.90",
+    "@budibase/frontend-core": "^1.0.90",
+    "@budibase/string-templates": "^1.0.90",
     "@sentry/browser": "5.19.1",
     "@spectrum-css/page": "^3.0.1",
     "@spectrum-css/vars": "^3.0.1",
diff --git a/packages/cli/package.json b/packages/cli/package.json
index 7a6a95a5dc..8e65e5e821 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/cli",
-  "version": "1.0.89-alpha.0",
+  "version": "1.0.90",
   "description": "Budibase CLI, for developers, self hosting and migrations.",
   "main": "src/index.js",
   "bin": {
diff --git a/packages/client/package.json b/packages/client/package.json
index 388e0bdea8..e7b6592737 100644
--- a/packages/client/package.json
+++ b/packages/client/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/client",
-  "version": "1.0.89-alpha.0",
+  "version": "1.0.90",
   "license": "MPL-2.0",
   "module": "dist/budibase-client.js",
   "main": "dist/budibase-client.js",
@@ -19,9 +19,9 @@
     "dev:builder": "rollup -cw"
   },
   "dependencies": {
-    "@budibase/bbui": "^1.0.89-alpha.0",
-    "@budibase/frontend-core": "^1.0.89-alpha.0",
-    "@budibase/string-templates": "^1.0.89-alpha.0",
+    "@budibase/bbui": "^1.0.90",
+    "@budibase/frontend-core": "^1.0.90",
+    "@budibase/string-templates": "^1.0.90",
     "@spectrum-css/button": "^3.0.3",
     "@spectrum-css/card": "^3.0.3",
     "@spectrum-css/divider": "^1.0.3",
diff --git a/packages/client/src/utils/buttonActions.js b/packages/client/src/utils/buttonActions.js
index 25659cea98..f44e7d7453 100644
--- a/packages/client/src/utils/buttonActions.js
+++ b/packages/client/src/utils/buttonActions.js
@@ -250,9 +250,9 @@ const exportDataHandler = async action => {
       const data = await API.exportRows({
         tableId: selection.tableId,
         rows: selection.selectedRows,
+        format: action.parameters.type,
       })
-
-      download(JSON.stringify(data), `export.${action.parameters.type}`)
+      download(data, `${selection.tableId}.${action.parameters.type}`)
     } catch (error) {
       notificationStore.actions.error("There was an error exporting the data")
     }
diff --git a/packages/frontend-core/package.json b/packages/frontend-core/package.json
index 4d2b46a081..2d18fe7a89 100644
--- a/packages/frontend-core/package.json
+++ b/packages/frontend-core/package.json
@@ -1,12 +1,12 @@
 {
   "name": "@budibase/frontend-core",
-  "version": "1.0.89-alpha.0",
+  "version": "1.0.90",
   "description": "Budibase frontend core libraries used in builder and client",
   "author": "Budibase",
   "license": "MPL-2.0",
   "svelte": "src/index.js",
   "dependencies": {
-    "@budibase/bbui": "^1.0.89-alpha.0",
+    "@budibase/bbui": "^1.0.90",
     "lodash": "^4.17.21",
     "svelte": "^3.46.2"
   }
diff --git a/packages/frontend-core/src/api/rows.js b/packages/frontend-core/src/api/rows.js
index 1b6efe624f..6a0d278cf7 100644
--- a/packages/frontend-core/src/api/rows.js
+++ b/packages/frontend-core/src/api/rows.js
@@ -66,12 +66,15 @@ export const buildRowEndpoints = API => ({
    * @param tableId the table ID to export the rows from
    * @param rows the array of rows to export
    */
-  exportRows: async ({ tableId, rows }) => {
+  exportRows: async ({ tableId, rows, format }) => {
     return await API.post({
-      url: `/api/${tableId}/rows/exportRows`,
+      url: `/api/${tableId}/rows/exportRows?format=${format}`,
       body: {
         rows,
       },
+      parseResponse: async response => {
+        return await response.text()
+      },
     })
   },
 })
diff --git a/packages/server/package.json b/packages/server/package.json
index f7570cc8d5..fe06fcd5df 100644
--- a/packages/server/package.json
+++ b/packages/server/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/server",
   "email": "hi@budibase.com",
-  "version": "1.0.89-alpha.0",
+  "version": "1.0.90",
   "description": "Budibase Web Server",
   "main": "src/index.ts",
   "repository": {
@@ -71,9 +71,9 @@
   "license": "GPL-3.0",
   "dependencies": {
     "@apidevtools/swagger-parser": "^10.0.3",
-    "@budibase/backend-core": "^1.0.89-alpha.0",
-    "@budibase/client": "^1.0.89-alpha.0",
-    "@budibase/string-templates": "^1.0.89-alpha.0",
+    "@budibase/backend-core": "^1.0.90",
+    "@budibase/client": "^1.0.90",
+    "@budibase/string-templates": "^1.0.90",
     "@bull-board/api": "^3.7.0",
     "@bull-board/koa": "^3.7.0",
     "@elastic/elasticsearch": "7.10.0",
diff --git a/packages/server/src/api/controllers/row/external.js b/packages/server/src/api/controllers/row/external.js
index aebcfce724..a8c8c0a627 100644
--- a/packages/server/src/api/controllers/row/external.js
+++ b/packages/server/src/api/controllers/row/external.js
@@ -10,6 +10,8 @@ const {
 } = require("../../../integrations/utils")
 const ExternalRequest = require("./ExternalRequest")
 const { getAppDB } = require("@budibase/backend-core/context")
+const exporters = require("../view/exporters")
+const { apiFileReturn } = require("../../../utilities/fileSystem")
 
 async function handleRequest(operation, tableId, opts = {}) {
   // make sure the filters are cleaned up, no empty strings for equals, fuzzy or string
@@ -155,6 +157,7 @@ exports.validate = async () => {
 exports.exportRows = async ctx => {
   const { datasourceId, tableName } = breakExternalTableId(ctx.params.tableId)
   const db = getAppDB()
+  let format = ctx.query.format
   const datasource = await db.get(datasourceId)
   if (!datasource || !datasource.entities) {
     ctx.throw(400, "Datasource has not been configured for plus API.")
@@ -164,13 +167,22 @@ exports.exportRows = async ctx => {
   ctx.request.body = {
     query: {
       oneOf: {
-        [table.primaryDisplay]: ctx.request.body.map(
+        [table.primaryDisplay]: ctx.request.body.rows.map(
           id => breakRowIdField(id)[0]
         ),
       },
     },
   }
-  return exports.search(ctx)
+
+  let result = await exports.search(ctx)
+
+  let headers = Object.keys(result.rows[0])
+  const exporter = exporters[format]
+  const filename = `export.${format}`
+
+  // send down the file
+  ctx.attachment(filename)
+  return apiFileReturn(exporter(headers, result.rows))
 }
 
 exports.fetchEnrichedRow = async ctx => {
diff --git a/packages/server/src/api/controllers/row/internal.js b/packages/server/src/api/controllers/row/internal.js
index 068a485a8a..8801827649 100644
--- a/packages/server/src/api/controllers/row/internal.js
+++ b/packages/server/src/api/controllers/row/internal.js
@@ -27,6 +27,8 @@ const {
 const { cloneDeep } = require("lodash/fp")
 const { getAppDB } = require("@budibase/backend-core/context")
 const { finaliseRow, updateRelatedFormula } = require("./staticFormula")
+const exporters = require("../view/exporters")
+const { apiFileReturn } = require("../../../utilities/fileSystem")
 
 const CALCULATION_TYPES = {
   SUM: "sum",
@@ -366,6 +368,7 @@ exports.exportRows = async ctx => {
   const db = getAppDB()
   const table = await db.get(ctx.params.tableId)
   const rowIds = ctx.request.body.rows
+  let format = ctx.query.format
   let response = (
     await db.allDocs({
       include_docs: true,
@@ -375,7 +378,13 @@ exports.exportRows = async ctx => {
 
   let rows = await outputProcessing(table, response)
 
-  return rows
+  let headers = Object.keys(rows[0])
+  const exporter = exporters[format]
+  const filename = `export.${format}`
+
+  // send down the file
+  ctx.attachment(filename)
+  return apiFileReturn(exporter(headers, rows))
 }
 
 exports.fetchEnrichedRow = async ctx => {
diff --git a/packages/server/src/api/routes/public/index.ts b/packages/server/src/api/routes/public/index.ts
index 04446d543f..57436def1d 100644
--- a/packages/server/src/api/routes/public/index.ts
+++ b/packages/server/src/api/routes/public/index.ts
@@ -5,6 +5,7 @@ import rowEndpoints from "./rows"
 import userEndpoints from "./users"
 import usage from "../../../middleware/usageQuota"
 import authorized from "../../../middleware/authorized"
+import publicApi from "../../../middleware/publicApi"
 import { paramResource, paramSubResource } from "../../../middleware/resourceId"
 import { CtxFn } from "./utils/Endpoint"
 import mapperMiddleware from "./middleware/mapper"
@@ -101,6 +102,12 @@ function applyRoutes(
   const paramMiddleware = subResource
     ? paramSubResource(resource, subResource)
     : paramResource(resource)
+  const publicApiMiddleware = publicApi({
+    requiresAppId:
+      permType !== PermissionTypes.APP && permType !== PermissionTypes.USER,
+  })
+  addMiddleware(endpoints.read, publicApiMiddleware)
+  addMiddleware(endpoints.write, publicApiMiddleware)
   // add the parameter capture middleware
   addMiddleware(endpoints.read, paramMiddleware)
   addMiddleware(endpoints.write, paramMiddleware)
diff --git a/packages/server/src/middleware/publicApi.js b/packages/server/src/middleware/publicApi.js
new file mode 100644
index 0000000000..563612c1ea
--- /dev/null
+++ b/packages/server/src/middleware/publicApi.js
@@ -0,0 +1,21 @@
+const { Headers } = require("@budibase/backend-core/constants")
+const { getAppId } = require("@budibase/backend-core/utils")
+
+module.exports = function ({ requiresAppId } = {}) {
+  return async (ctx, next) => {
+    const appId = getAppId(ctx)
+    if (requiresAppId && !appId) {
+      ctx.throw(
+        400,
+        `Invalid app ID provided, please check the ${Headers.APP_ID} header.`
+      )
+    }
+    if (!ctx.headers[Headers.API_KEY]) {
+      ctx.throw(
+        400,
+        `Invalid API key provided, please check the ${Headers.API_KEY} header.`
+      )
+    }
+    return next()
+  }
+}
diff --git a/packages/string-templates/package.json b/packages/string-templates/package.json
index 8b01a2ab1a..d5697c8557 100644
--- a/packages/string-templates/package.json
+++ b/packages/string-templates/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@budibase/string-templates",
-  "version": "1.0.89-alpha.0",
+  "version": "1.0.90",
   "description": "Handlebars wrapper for Budibase templating.",
   "main": "src/index.cjs",
   "module": "dist/bundle.mjs",
diff --git a/packages/worker/package.json b/packages/worker/package.json
index e85178027f..72518afe12 100644
--- a/packages/worker/package.json
+++ b/packages/worker/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@budibase/worker",
   "email": "hi@budibase.com",
-  "version": "1.0.89-alpha.0",
+  "version": "1.0.90",
   "description": "Budibase background service",
   "main": "src/index.ts",
   "repository": {
@@ -34,8 +34,8 @@
   "author": "Budibase",
   "license": "GPL-3.0",
   "dependencies": {
-    "@budibase/backend-core": "^1.0.89-alpha.0",
-    "@budibase/string-templates": "^1.0.89-alpha.0",
+    "@budibase/backend-core": "^1.0.90",
+    "@budibase/string-templates": "^1.0.90",
     "@koa/router": "^8.0.0",
     "@sentry/node": "^6.0.0",
     "@techpass/passport-openidconnect": "^0.3.0",