diff --git a/.eslintrc.js b/.eslintrc.js
index 94c22cf68..3c52cf91f 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -11,7 +11,8 @@ module.exports = {
     $: 'readonly',
     alert: 'readonly',
     document: 'readonly',
-    window: 'readonly'
+    window: 'readonly',
+    defineModel: 'readonly'
   },
   rules: {
     'arrow-parens': 'off',
diff --git a/e2e-tests/run-tests.sh b/e2e-tests/run-tests.sh
index f2efa0be9..10e7667f2 100755
--- a/e2e-tests/run-tests.sh
+++ b/e2e-tests/run-tests.sh
@@ -67,7 +67,7 @@ if [[ ${CI-} = true ]]; then
 fi
 
 log "Installing npm packages..."
-npm install
+npm ci
 
 cd e2e-tests
 log "Playwright: $(npx playwright --version)"
diff --git a/e2e-tests/tests/enketo.spec.js b/e2e-tests/tests/enketo.spec.js
index 342415493..e12a18cd8 100644
--- a/e2e-tests/tests/enketo.spec.js
+++ b/e2e-tests/tests/enketo.spec.js
@@ -251,7 +251,7 @@ test.describe('Enketo', () => {
     await expect(frame.getByRole('heading', { name: 'Successful' })).toBeVisible();
   });
 
-  test('default value is consistent between rendering enketo directly or via iframe', async ({ page }) => {
+  test('default value is consistent between rendering enketo directly and via iframe', async ({ page }) => {
     await login(page);
 
     const queryWithSpaces = '?d[/data/first_name]=hello earth + hello mars %20 hello jupiter %2B hello saturn';
@@ -259,12 +259,13 @@ test.describe('Enketo', () => {
     await page.goto(`${appUrl}/enketo-passthrough/${publishedForm.enketoId}${queryWithSpaces}`);
     await expect(page.getByRole('heading', { name: publishedForm.name })).toBeVisible();
 
-    const defaultValueInEnketo = await page.getByLabel('First Name').inputValue();
+    await expect(page.getByLabel('First Name')).toHaveValue('hello earth + hello mars   hello jupiter + hello saturn');
 
     await page.goto(`${appUrl}/projects/${projectId}/forms/${publishedForm.xmlFormId}/submissions/new${queryWithSpaces}`);
     const iframe = await page.frameLocator('iframe');
     await expect(iframe.getByRole('heading', { name: publishedForm.name })).toBeVisible();
 
-    await expect(iframe.getByLabel('First Name')).toHaveValue(defaultValueInEnketo);
+    // except we transform + into space as well in iframe
+    await expect(iframe.getByLabel('First Name')).toHaveValue('hello earth   hello mars   hello jupiter + hello saturn');
   });
 });
diff --git a/main.nginx.conf b/main.nginx.conf
index 7cfd463f6..69ce7e9a9 100644
--- a/main.nginx.conf
+++ b/main.nginx.conf
@@ -46,6 +46,21 @@ http {
     ~^__Host-(session=.+)$ $1;
   }
 
+  map $args $qp_deliminator {
+    ~.+ "&";
+    default "?";
+  }
+
+  map $arg_st $redirect_non_single_prefix {
+    ~.+     "${is_args}${args}${qp_deliminator}single=false";
+    default "/new${is_args}${args}";
+  }
+
+  map $arg_st $redirect_single_prefix {
+    ~.+     "${is_args}${args}";
+    default "/new${is_args}${args}${qp_deliminator}single=true";
+  }
+
   server {
     listen 8686;
     server_name localhost;
@@ -70,7 +85,9 @@ http {
     # Following are the locations that serve a Form and these are redirected to the frontend:
     location ~ "^/-/single/(?<enketoId>[a-zA-Z0-9]+)$" {
       # Form fill link, public
-      return 301 "/f/$enketoId$is_args$args";
+      # If 'st' query parameter is not present, redirect to protected route with single only
+      # end-of-form behavior (/new?single=true)
+      return 301 "/f/$enketoId$redirect_single_prefix";
     }
     location ~ "^/-/preview/(?<enketoId>[a-zA-Z0-9]+)$" {
       # preview link
@@ -81,7 +98,8 @@ http {
     # we don't want them to be redirected to central-frontend
     location ~ "^/-/(?!thanks$|connection$|login$|logout$|api$|preview$)(?<enketoId>[a-zA-Z0-9]+)$" {
       # Form fill link (non-public), or Draft
-      return 301 "/f/$enketoId/new$is_args$args";
+      # If 'st' query parameter is present, add ?single=false for public access
+      return 301 "/f/$enketoId$redirect_non_single_prefix";
     }
     location = /-/single/check-submitted {
         alias ./dist/blank.html;
diff --git a/package-lock.json b/package-lock.json
index 75ea9d985..ebbb69562 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.1.0",
       "dependencies": {
         "@floating-ui/dom": "^1.1.0",
-        "@getodk/web-forms": "^0.13.1",
+        "@getodk/web-forms": "^0.14.0",
         "axios": "^1.6.2",
         "bootstrap": "~3",
         "dompurify": "^3.2.5",
@@ -336,12 +336,12 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz",
-      "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz",
+      "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==",
       "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.28.2"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -422,9 +422,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
-      "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
+      "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^7.27.1",
@@ -949,20 +949,20 @@
       }
     },
     "node_modules/@getodk/web-forms": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/@getodk/web-forms/-/web-forms-0.13.1.tgz",
-      "integrity": "sha512-BCcanQTxF3zfk7JVGcFZ5Wa0bp+C4gIJQnKefByELTYzylSUpDowzBiyf4T+L/uJvjEX8aMxO+SU6rvsGPPKlg==",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@getodk/web-forms/-/web-forms-0.14.0.tgz",
+      "integrity": "sha512-0pr2LkFl9eR/ihEOT3SxmZvZqfk79ab12pvCPmdm7ACtnwVDd1vUFCtlCaTxHprfT0HmPcEh322ZIUY5HLkTqg==",
       "license": "Apache-2.0",
       "dependencies": {
         "@mdi/js": "^7.4.47",
         "vue-draggable-plus": "^0.6.0"
       },
       "engines": {
-        "node": "^18.20.5 || ^20.18.1 || ^22.12.0",
+        "node": "^20.19.3 || ^22.12.0 || ^24.3.0",
         "yarn": "1.22.22"
       },
       "peerDependencies": {
-        "vue": "^3.5.13"
+        "vue": "^3.5.18"
       }
     },
     "node_modules/@hapi/hoek": {
@@ -2499,16 +2499,16 @@
       }
     },
     "node_modules/@vue/compiler-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
-      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.20.tgz",
+      "integrity": "sha512-8TWXUyiqFd3GmP4JTX9hbiTFRwYHgVL/vr3cqhr4YQ258+9FADwvj7golk2sWNGHR67QgmCZ8gz80nQcMokhwg==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.28.3",
+        "@vue/shared": "3.5.20",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.0"
+        "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-core/node_modules/entities": {
@@ -2524,40 +2524,40 @@
       }
     },
     "node_modules/@vue/compiler-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
-      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.20.tgz",
+      "integrity": "sha512-whB44M59XKjqUEYOMPYU0ijUV0G+4fdrHVKDe32abNdX/kJe1NUEMqsi4cwzXa9kyM9w5S8WqFsrfo1ogtBZGQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-core": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-core": "3.5.20",
+        "@vue/shared": "3.5.20"
       }
     },
     "node_modules/@vue/compiler-sfc": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
-      "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.20.tgz",
+      "integrity": "sha512-SFcxapQc0/feWiSBfkGsa1v4DOrnMAQSYuvDMpEaxbpH5dKbnEM5KobSNSgU+1MbHCl+9ftm7oQWxvwDB6iBfw==",
       "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.25.3",
-        "@vue/compiler-core": "3.5.13",
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.28.3",
+        "@vue/compiler-core": "3.5.20",
+        "@vue/compiler-dom": "3.5.20",
+        "@vue/compiler-ssr": "3.5.20",
+        "@vue/shared": "3.5.20",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.11",
-        "postcss": "^8.4.48",
-        "source-map-js": "^1.2.0"
+        "magic-string": "^0.30.17",
+        "postcss": "^8.5.6",
+        "source-map-js": "^1.2.1"
       }
     },
     "node_modules/@vue/compiler-ssr": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
-      "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.20.tgz",
+      "integrity": "sha512-RSl5XAMc5YFUXpDQi+UQDdVjH9FnEpLDHIALg5J0ITHxkEzJ8uQLlo7CIbjPYqmZtt6w0TsIPbo1izYXwDG7JA==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-dom": "3.5.20",
+        "@vue/shared": "3.5.20"
       }
     },
     "node_modules/@vue/component-compiler-utils": {
@@ -2651,53 +2651,53 @@
       }
     },
     "node_modules/@vue/reactivity": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
-      "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.20.tgz",
+      "integrity": "sha512-hS8l8x4cl1fmZpSQX/NXlqWKARqEsNmfkwOIYqtR2F616NGfsLUm0G6FQBK6uDKUCVyi1YOL8Xmt/RkZcd/jYQ==",
       "license": "MIT",
       "dependencies": {
-        "@vue/shared": "3.5.13"
+        "@vue/shared": "3.5.20"
       }
     },
     "node_modules/@vue/runtime-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
-      "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.20.tgz",
+      "integrity": "sha512-vyQRiH5uSZlOa+4I/t4Qw/SsD/gbth0SW2J7oMeVlMFMAmsG1rwDD6ok0VMmjXY3eI0iHNSSOBilEDW98PLRKw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/reactivity": "3.5.20",
+        "@vue/shared": "3.5.20"
       }
     },
     "node_modules/@vue/runtime-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
-      "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.20.tgz",
+      "integrity": "sha512-KBHzPld/Djw3im0CQ7tGCpgRedryIn4CcAl047EhFTCCPT2xFf4e8j6WeKLgEEoqPSl9TYqShc3Q6tpWpz/Xgw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/runtime-core": "3.5.13",
-        "@vue/shared": "3.5.13",
+        "@vue/reactivity": "3.5.20",
+        "@vue/runtime-core": "3.5.20",
+        "@vue/shared": "3.5.20",
         "csstype": "^3.1.3"
       }
     },
     "node_modules/@vue/server-renderer": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
-      "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.20.tgz",
+      "integrity": "sha512-HthAS0lZJDH21HFJBVNTtx+ULcIbJQRpjSVomVjfyPkFSpCwvsPTA+jIzOaUm3Hrqx36ozBHePztQFg6pj5aKg==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-ssr": "3.5.20",
+        "@vue/shared": "3.5.20"
       },
       "peerDependencies": {
-        "vue": "3.5.13"
+        "vue": "3.5.20"
       }
     },
     "node_modules/@vue/shared": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
-      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.20.tgz",
+      "integrity": "sha512-SoRGP596KU/ig6TfgkCMbXkr4YJ91n/QSdMuqeP5r3hVIYA3CPHUBCc7Skak0EAKV+5lL4KyIh61VA/pK1CIAA==",
       "license": "MIT"
     },
     "node_modules/@vue/test-utils": {
@@ -10268,9 +10268,9 @@
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "funding": [
         {
           "type": "opencollective",
@@ -10287,7 +10287,7 @@
       ],
       "license": "MIT",
       "dependencies": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       },
@@ -12958,16 +12958,16 @@
       }
     },
     "node_modules/vue": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
-      "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.20.tgz",
+      "integrity": "sha512-2sBz0x/wis5TkF1XZ2vH25zWq3G1bFEPOfkBcx2ikowmphoQsPH6X0V3mmPCXA2K1N/XGTnifVyDQP4GfDDeQw==",
       "license": "MIT",
       "dependencies": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/compiler-sfc": "3.5.13",
-        "@vue/runtime-dom": "3.5.13",
-        "@vue/server-renderer": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-dom": "3.5.20",
+        "@vue/compiler-sfc": "3.5.20",
+        "@vue/runtime-dom": "3.5.20",
+        "@vue/server-renderer": "3.5.20",
+        "@vue/shared": "3.5.20"
       },
       "peerDependencies": {
         "typescript": "*"
@@ -14453,11 +14453,11 @@
       }
     },
     "@babel/parser": {
-      "version": "7.27.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.27.2.tgz",
-      "integrity": "sha512-QYLs8299NA7WM/bZAdp+CviYYkVoYXlDW2rzliy3chxd1PQjej7JORuMJDJXJUb9g0TT+B99EwaVLKmX+sPXWw==",
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.3.tgz",
+      "integrity": "sha512-7+Ey1mAgYqFAx2h0RuoxcQT5+MlG3GTV0TQrgr7/ZliKsm/MNDxVVutlWaziMq7wJNAz8MTqz55XLpWvva6StA==",
       "requires": {
-        "@babel/types": "^7.27.1"
+        "@babel/types": "^7.28.2"
       }
     },
     "@babel/runtime": {
@@ -14516,9 +14516,9 @@
       }
     },
     "@babel/types": {
-      "version": "7.27.1",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.27.1.tgz",
-      "integrity": "sha512-+EzkxvLNfiUeKMgy/3luqfsCWFRXLb7U6wNQTk60tovuckwB15B191tJWvpp4HjiQWdJkCxO3Wbvc6jlk3Xb2Q==",
+      "version": "7.28.2",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
+      "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
       "requires": {
         "@babel/helper-string-parser": "^7.27.1",
         "@babel/helper-validator-identifier": "^7.27.1"
@@ -14759,9 +14759,9 @@
       }
     },
     "@getodk/web-forms": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/@getodk/web-forms/-/web-forms-0.13.1.tgz",
-      "integrity": "sha512-BCcanQTxF3zfk7JVGcFZ5Wa0bp+C4gIJQnKefByELTYzylSUpDowzBiyf4T+L/uJvjEX8aMxO+SU6rvsGPPKlg==",
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/@getodk/web-forms/-/web-forms-0.14.0.tgz",
+      "integrity": "sha512-0pr2LkFl9eR/ihEOT3SxmZvZqfk79ab12pvCPmdm7ACtnwVDd1vUFCtlCaTxHprfT0HmPcEh322ZIUY5HLkTqg==",
       "requires": {
         "@mdi/js": "^7.4.47",
         "vue-draggable-plus": "^0.6.0"
@@ -15835,15 +15835,15 @@
       }
     },
     "@vue/compiler-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.13.tgz",
-      "integrity": "sha512-oOdAkwqUfW1WqpwSYJce06wvt6HljgY3fGeM9NcVA1HaYOij3mZG9Rkysn0OHuyUAGMbEbARIpsG+LPVlBJ5/Q==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.20.tgz",
+      "integrity": "sha512-8TWXUyiqFd3GmP4JTX9hbiTFRwYHgVL/vr3cqhr4YQ258+9FADwvj7golk2sWNGHR67QgmCZ8gz80nQcMokhwg==",
       "requires": {
-        "@babel/parser": "^7.25.3",
-        "@vue/shared": "3.5.13",
+        "@babel/parser": "^7.28.3",
+        "@vue/shared": "3.5.20",
         "entities": "^4.5.0",
         "estree-walker": "^2.0.2",
-        "source-map-js": "^1.2.0"
+        "source-map-js": "^1.2.1"
       },
       "dependencies": {
         "entities": {
@@ -15854,37 +15854,37 @@
       }
     },
     "@vue/compiler-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.13.tgz",
-      "integrity": "sha512-ZOJ46sMOKUjO3e94wPdCzQ6P1Lx/vhp2RSvfaab88Ajexs0AHeV0uasYhi99WPaogmBlRHNRuly8xV75cNTMDA==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.20.tgz",
+      "integrity": "sha512-whB44M59XKjqUEYOMPYU0ijUV0G+4fdrHVKDe32abNdX/kJe1NUEMqsi4cwzXa9kyM9w5S8WqFsrfo1ogtBZGQ==",
       "requires": {
-        "@vue/compiler-core": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-core": "3.5.20",
+        "@vue/shared": "3.5.20"
       }
     },
     "@vue/compiler-sfc": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.13.tgz",
-      "integrity": "sha512-6VdaljMpD82w6c2749Zhf5T9u5uLBWKnVue6XWxprDobftnletJ8+oel7sexFfM3qIxNmVE7LSFGTpv6obNyaQ==",
-      "requires": {
-        "@babel/parser": "^7.25.3",
-        "@vue/compiler-core": "3.5.13",
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.20.tgz",
+      "integrity": "sha512-SFcxapQc0/feWiSBfkGsa1v4DOrnMAQSYuvDMpEaxbpH5dKbnEM5KobSNSgU+1MbHCl+9ftm7oQWxvwDB6iBfw==",
+      "requires": {
+        "@babel/parser": "^7.28.3",
+        "@vue/compiler-core": "3.5.20",
+        "@vue/compiler-dom": "3.5.20",
+        "@vue/compiler-ssr": "3.5.20",
+        "@vue/shared": "3.5.20",
         "estree-walker": "^2.0.2",
-        "magic-string": "^0.30.11",
-        "postcss": "^8.4.48",
-        "source-map-js": "^1.2.0"
+        "magic-string": "^0.30.17",
+        "postcss": "^8.5.6",
+        "source-map-js": "^1.2.1"
       }
     },
     "@vue/compiler-ssr": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.13.tgz",
-      "integrity": "sha512-wMH6vrYHxQl/IybKJagqbquvxpWCuVYpoUJfCqFZwa/JY1GdATAQ+TgVtgrwwMZ0D07QhA99rs/EAAWfvG6KpA==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.20.tgz",
+      "integrity": "sha512-RSl5XAMc5YFUXpDQi+UQDdVjH9FnEpLDHIALg5J0ITHxkEzJ8uQLlo7CIbjPYqmZtt6w0TsIPbo1izYXwDG7JA==",
       "requires": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-dom": "3.5.20",
+        "@vue/shared": "3.5.20"
       }
     },
     "@vue/component-compiler-utils": {
@@ -15966,46 +15966,46 @@
       }
     },
     "@vue/reactivity": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.13.tgz",
-      "integrity": "sha512-NaCwtw8o48B9I6L1zl2p41OHo/2Z4wqYGGIK1Khu5T7yxrn+ATOixn/Udn2m+6kZKB/J7cuT9DbWWhRxqixACg==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.20.tgz",
+      "integrity": "sha512-hS8l8x4cl1fmZpSQX/NXlqWKARqEsNmfkwOIYqtR2F616NGfsLUm0G6FQBK6uDKUCVyi1YOL8Xmt/RkZcd/jYQ==",
       "requires": {
-        "@vue/shared": "3.5.13"
+        "@vue/shared": "3.5.20"
       }
     },
     "@vue/runtime-core": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.13.tgz",
-      "integrity": "sha512-Fj4YRQ3Az0WTZw1sFe+QDb0aXCerigEpw418pw1HBUKFtnQHWzwojaukAs2X/c9DQz4MQ4bsXTGlcpGxU/RCIw==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.20.tgz",
+      "integrity": "sha512-vyQRiH5uSZlOa+4I/t4Qw/SsD/gbth0SW2J7oMeVlMFMAmsG1rwDD6ok0VMmjXY3eI0iHNSSOBilEDW98PLRKw==",
       "requires": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/reactivity": "3.5.20",
+        "@vue/shared": "3.5.20"
       }
     },
     "@vue/runtime-dom": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.13.tgz",
-      "integrity": "sha512-dLaj94s93NYLqjLiyFzVs9X6dWhTdAlEAciC3Moq7gzAc13VJUdCnjjRurNM6uTLFATRHexHCTu/Xp3eW6yoog==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.20.tgz",
+      "integrity": "sha512-KBHzPld/Djw3im0CQ7tGCpgRedryIn4CcAl047EhFTCCPT2xFf4e8j6WeKLgEEoqPSl9TYqShc3Q6tpWpz/Xgw==",
       "requires": {
-        "@vue/reactivity": "3.5.13",
-        "@vue/runtime-core": "3.5.13",
-        "@vue/shared": "3.5.13",
+        "@vue/reactivity": "3.5.20",
+        "@vue/runtime-core": "3.5.20",
+        "@vue/shared": "3.5.20",
         "csstype": "^3.1.3"
       }
     },
     "@vue/server-renderer": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.13.tgz",
-      "integrity": "sha512-wAi4IRJV/2SAW3htkTlB+dHeRmpTiVIK1OGLWV1yeStVSebSQQOwGwIq0D3ZIoBj2C2qpgz5+vX9iEBkTdk5YA==",
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.20.tgz",
+      "integrity": "sha512-HthAS0lZJDH21HFJBVNTtx+ULcIbJQRpjSVomVjfyPkFSpCwvsPTA+jIzOaUm3Hrqx36ozBHePztQFg6pj5aKg==",
       "requires": {
-        "@vue/compiler-ssr": "3.5.13",
-        "@vue/shared": "3.5.13"
+        "@vue/compiler-ssr": "3.5.20",
+        "@vue/shared": "3.5.20"
       }
     },
     "@vue/shared": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.13.tgz",
-      "integrity": "sha512-/hnE/qP5ZoGpol0a5mDi45bOd7t3tjYJBjsgCsivow7D48cJeV5l05RD82lPqi7gRiphZM37rnhW1l6ZoCNNnQ=="
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.20.tgz",
+      "integrity": "sha512-SoRGP596KU/ig6TfgkCMbXkr4YJ91n/QSdMuqeP5r3hVIYA3CPHUBCc7Skak0EAKV+5lL4KyIh61VA/pK1CIAA=="
     },
     "@vue/test-utils": {
       "version": "2.4.6",
@@ -21657,11 +21657,11 @@
       }
     },
     "postcss": {
-      "version": "8.5.3",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
-      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
+      "version": "8.5.6",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz",
+      "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==",
       "requires": {
-        "nanoid": "^3.3.8",
+        "nanoid": "^3.3.11",
         "picocolors": "^1.1.1",
         "source-map-js": "^1.2.1"
       }
@@ -23491,15 +23491,15 @@
       "dev": true
     },
     "vue": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.13.tgz",
-      "integrity": "sha512-wmeiSMxkZCSc+PM2w2VRsOYAZC8GdipNFRTsLSfodVqI9mbejKeXEGr8SckuLnrQPGe3oJN5c3K0vpoU9q/wCQ==",
-      "requires": {
-        "@vue/compiler-dom": "3.5.13",
-        "@vue/compiler-sfc": "3.5.13",
-        "@vue/runtime-dom": "3.5.13",
-        "@vue/server-renderer": "3.5.13",
-        "@vue/shared": "3.5.13"
+      "version": "3.5.20",
+      "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.20.tgz",
+      "integrity": "sha512-2sBz0x/wis5TkF1XZ2vH25zWq3G1bFEPOfkBcx2ikowmphoQsPH6X0V3mmPCXA2K1N/XGTnifVyDQP4GfDDeQw==",
+      "requires": {
+        "@vue/compiler-dom": "3.5.20",
+        "@vue/compiler-sfc": "3.5.20",
+        "@vue/runtime-dom": "3.5.20",
+        "@vue/server-renderer": "3.5.20",
+        "@vue/shared": "3.5.20"
       }
     },
     "vue-component-type-helpers": {
diff --git a/package.json b/package.json
index bc6e39512..d0b8876e0 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@floating-ui/dom": "^1.1.0",
-    "@getodk/web-forms": "^0.13.1",
+    "@getodk/web-forms": "^0.14.0",
     "axios": "^1.6.2",
     "bootstrap": "~3",
     "dompurify": "^3.2.5",
diff --git a/src/assets/scss/_mixins.scss b/src/assets/scss/_mixins.scss
index 3c275ad98..4f20d86d0 100644
--- a/src/assets/scss/_mixins.scss
+++ b/src/assets/scss/_mixins.scss
@@ -114,3 +114,17 @@
 
   &::after { clear: both; }
 }
+
+@mixin floating-container {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  position: fixed;
+  left: 10vw;
+  width: 80vw;
+  bottom: 34px;
+  z-index: $z-index-toast;
+  pointer-events: none;
+
+  & > * { pointer-events: auto; }
+}
diff --git a/src/assets/scss/_variables.scss b/src/assets/scss/_variables.scss
index fc3d05cdd..5d6918d67 100644
--- a/src/assets/scss/_variables.scss
+++ b/src/assets/scss/_variables.scss
@@ -85,6 +85,8 @@ $padding-bottom-table-data: 8px;
 $padding-left-table-data: 8px;
 $padding-right-table-data: 8px;
 $padding-top-table-data: 8px;
+// Row
+$color-selected-row: #E4EDF1;
 
 // Panels
 $box-shadow-panel-main: 0 0 24px rgba(0, 0, 0, 0.25), 0 35px 115px rgba(0, 0, 0, 0.28);
@@ -131,3 +133,6 @@ $max-width-page-body: 1280px;
 
 // Popover
 $box-shadow-popover: 0 5px 10px rgba(0, 0, 0, 0.2);
+
+// Figma Variables
+$m3-elevation-light-3: 0px 4px 8px 3px rgba(0, 0, 0, 0.15), 0px 1px 3px 0px rgba(0, 0, 0, 0.30);
diff --git a/src/assets/scss/app.scss b/src/assets/scss/app.scss
index 59bc11a7d..9ad75fe6b 100644
--- a/src/assets/scss/app.scss
+++ b/src/assets/scss/app.scss
@@ -186,7 +186,7 @@ class. */
 ////////////////////////////////////////////////////////////////////////////////
 // LINKS AND BUTTONS
 
-.btn, a {
+.btn, a, button.close {
   &[aria-disabled="true"], &.disabled, fieldset[disabled] & {
     cursor: not-allowed;
     opacity: 0.65;
diff --git a/src/components/action-bar.vue b/src/components/action-bar.vue
new file mode 100644
index 000000000..45e384506
--- /dev/null
+++ b/src/components/action-bar.vue
@@ -0,0 +1,90 @@
+<!--
+Copyright 2025 ODK Central Developers
+See the NOTICE file at the top-level directory of this distribution and at
+https://github.com/getodk/central-frontend/blob/master/NOTICE.
+
+This file is part of ODK Central. It is subject to the license terms in
+the LICENSE file found in the top-level directory of this distribution and at
+https://www.apache.org/licenses/LICENSE-2.0. No part of ODK Central,
+including this file, may be copied, modified, propagated, or distributed
+except according to the terms contained in the LICENSE file.
+-->
+<template>
+  <div v-show="state" class="action-bar-container">
+    <div class="action-bar" role="alert">
+      <div class="close-container">
+        <button type="button" class="close" :aria-disabled="disableClose"
+          :aria-label="$t('action.close')" @click="$emit('hide')">
+          <span aria-hidden="true" class="icon-times-circle"></span>
+        </button>
+      </div>
+      <div class="message"><span>{{ message }}</span></div>
+      <div class="cta-container">
+        <slot></slot>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup>
+defineProps({
+  state: {
+    type: Boolean,
+    required: true
+  },
+  message: {
+    type: String,
+    required: true
+  },
+  disableClose: Boolean
+});
+
+defineEmits(['hide']);
+</script>
+
+<style lang="scss">
+@import '../assets/scss/variables';
+@import '../assets/scss/mixins';
+
+.action-bar-container {
+  @include floating-container;
+
+  .action-bar {
+    box-shadow: $m3-elevation-light-3;
+    background-color: #fff;
+    display: flex;
+    align-items: center;
+    border-radius: 4px;
+
+    .message {
+      flex-grow: 1;
+      padding: 15px;
+      padding-right: 62px;
+    }
+
+    .cta-container,
+    .close-container {
+      flex-shrink: 0;
+      justify-content: center;
+    }
+
+    .cta-container {
+      padding-inline: 10px 18px;
+    }
+
+    .close-container {
+      padding-inline: 10px 0;
+    }
+
+    .close {
+      opacity: 1;
+      color: #595E6A;
+
+      &:not([aria-disabled]):hover,
+      &:not([aria-disabled]):focus {
+        color: #000;
+      }
+    }
+  }
+}
+</style>
diff --git a/src/components/alerts.vue b/src/components/alerts.vue
index 15750893a..a2d01de5c 100644
--- a/src/components/alerts.vue
+++ b/src/components/alerts.vue
@@ -48,22 +48,13 @@ watch(() => redAlert.messageId, () => {
 
 <style lang="scss">
 @import '../assets/scss/variables';
+@import '../assets/scss/mixins';
 
 #alerts {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  position: fixed;
-  left: 10vw;
-  width: 80vw;
-  bottom: 34px;
-  z-index: $z-index-toast;
-  pointer-events: none;
+  @include floating-container;
 
   .alert {
     margin-bottom: 0;
-    pointer-events: auto;
   }
 }
 </style>
diff --git a/src/components/enketo-iframe.vue b/src/components/enketo-iframe.vue
index 4e06e969c..0fbbed427 100644
--- a/src/components/enketo-iframe.vue
+++ b/src/components/enketo-iframe.vue
@@ -70,6 +70,12 @@ const lastSubmitted = (enketoOnceId) => {
 
 const enketoSrc = ref();
 
+const single = computed(() => {
+  const { query } = route;
+  return (props.actionType === 'public-link' && query.single !== 'false') ||
+         (props.actionType === 'new' && query.single === 'true');
+});
+
 const setEnketoSrc = () => {
   let basePath = '/enketo-passthrough';
   // this is to avoid 404 warning
@@ -77,25 +83,29 @@ const setEnketoSrc = () => {
     basePath = `/#${basePath}`;
   }
   let prefix = basePath;
-  const { search } = new URL(route.fullPath, location.origin);
+  const { return_url: _, returnUrl: __, ...query } = route.query;
 
-  // pass URL query parameters as it is to the Enketo iframe after stripping return URLs
-  let qs = `?parentWindowOrigin=${encodeURIComponent(location.origin)}`;
-  qs += (!search ? ''
-    : `&${search.substring(1)
-      .split('&')
-      .filter(queryParameter => !queryParameter.startsWith('return_url=') && !queryParameter.startsWith('returnUrl='))
-      .join('&')}`);
+  query.parentWindowOrigin = location.origin;
+
+  // We need to use encodeURIComponent here instead of URLSearchParams because enketo expects space
+  // to pass as either ' ' (literal space character) or '%20'. Whereas URLSearchParams converts
+  // space into '+' sign.
+  const qs = `?${Object.entries(query)
+    .filter(([, value]) => typeof value === 'string')
+    .map(([key, value]) => `${encodeURIComponent(key)}=${encodeURIComponent(value)}`)
+    .join('&')}`;
 
   if (props.actionType === 'offline') {
     return; // we don't render offline Enketo through central-frontend
   }
-  if (props.actionType === 'public-link') {
+  // for actionType 'new', we add '/single' only if 'single' query parameter is true
+  // for actionType 'public-link', we add '/single' only if 'single' query parameter is not false
+  if (single.value) {
     prefix += '/single';
   } else if (props.actionType === 'preview') {
     prefix += `/${props.actionType}`;
   }
-  // for actionType 'new', we don't need to add anything to the prefix.
+
   // we no longer render Enketo for Edit Submission from central-frontend.
 
   if (props.enketoId === form.enketoOnceId) {
@@ -131,7 +141,7 @@ const handleIframeMessage = (event) => {
     try { eventData = JSON.parse(event.data); } catch {}
 
     if (eventData?.enketoEvent === 'submissionsuccess') {
-      if (props.actionType === 'public-link' && redirectUrl.value) {
+      if (redirectUrl.value && single.value) {
         // for public link, we read return value from query parameter. The value could be 3rd party
         // site as well, typically a thank you page
         try {
diff --git a/src/components/entity/data-row.vue b/src/components/entity/data-row.vue
index 28afac7f3..ea4272b7c 100644
--- a/src/components/entity/data-row.vue
+++ b/src/components/entity/data-row.vue
@@ -10,7 +10,7 @@ including this file, may be copied, modified, propagated, or distributed
 except according to the terms contained in the LICENSE file.
 -->
 <template>
-  <tr class="entity-data-row">
+  <tr class="entity-data-row" :class="{ 'entity-row-selected': entity.__system.selected }">
     <td v-for="property of properties" :key="property.name">
       <span v-tooltip.text>{{ entity[property.odataName] }}</span>
     </td>
@@ -34,3 +34,11 @@ defineProps({
   }
 });
 </script>
+
+<style lang="scss">
+@import '../../assets/scss/variables';
+
+.entity-row-selected {
+  background-color: $color-selected-row;
+}
+</style>
diff --git a/src/components/entity/download-button.vue b/src/components/entity/download-button.vue
index 024b5ce65..aa2c22088 100644
--- a/src/components/entity/download-button.vue
+++ b/src/components/entity/download-button.vue
@@ -12,7 +12,7 @@ except according to the terms contained in the LICENSE file.
 <template>
   <div id="entity-download-button" class="dropdown">
     <a class="btn btn-primary" :class="{ disabled }" :href="href"
-      :data-toggle="odataFilter ? 'dropdown' : null">
+      :data-toggle="odataFilter || searchTerm ? 'dropdown' : null">
       <span class="icon-arrow-circle-down"></span>
       <span>{{ $t('action.download') }}</span>
     </a>
@@ -41,6 +41,7 @@ import { useRequestData } from '../../request-data';
 
 const props = defineProps({
   odataFilter: String,
+  searchTerm: String,
   disabled: Boolean
 });
 
@@ -51,7 +52,7 @@ const href = computed(() =>
   apiPaths.entities(projectId, datasetName, '.csv'));
 
 const filteredHref = computed(() =>
-  apiPaths.entities(projectId, datasetName, '.csv', { $filter: props.odataFilter }));
+  apiPaths.entities(projectId, datasetName, '.csv', { $filter: props.odataFilter, $search: props.searchTerm }));
 
 const { dataset, odataEntities } = useRequestData();
 const { t } = useI18n();
@@ -91,10 +92,10 @@ const downloadFiltered = computed(() => (odataEntities.dataExists
       "download": {
         "unfiltered": "Download {count} Entity | Download all {count} Entities",
         "filtered": {
-          "withCount": "Download {count} Entity matching the filter | Download {count} Entities matching the filter",
+          "withCount": "Download {count} matching Entity | Download {count} matching Entities",
           // This is the text of a button. This text is shown when the number of
           // matching Entities is unknown.
-          "withoutCount": "Download all Entities matching the filter"
+          "withoutCount": "Download all matching Entities"
         }
       }
     }
diff --git a/src/components/entity/feed-entry.vue b/src/components/entity/feed-entry.vue
index 0189afd0a..dcf6b7a02 100644
--- a/src/components/entity/feed-entry.vue
+++ b/src/components/entity/feed-entry.vue
@@ -129,13 +129,13 @@ except according to the terms contained in the LICENSE file.
           <template #name><actor-link :actor="entry.actor"/></template>
         </i18n-t>
       </template>
-      <template v-else-if="entry.action === 'entity.delete'">
+      <template v-else-if="(entry.action === 'entity.delete' || entry.action === 'entity.bulk.delete')">
         <span class="icon-trash"></span>
         <i18n-t keypath="title.entity.delete">
           <template #name><actor-link :actor="entry.actor"/></template>
         </i18n-t>
       </template>
-      <template v-else-if="entry.action === 'entity.restore'">
+      <template v-else-if="(entry.action === 'entity.restore' || entry.action === 'entity.bulk.restore')">
         <span class="icon-recycle"></span>
         <i18n-t keypath="title.entity.restore">
           <template #label>
diff --git a/src/components/entity/filters.vue b/src/components/entity/filters.vue
index cccf53feb..ded91360c 100644
--- a/src/components/entity/filters.vue
+++ b/src/components/entity/filters.vue
@@ -11,6 +11,14 @@ except according to the terms contained in the LICENSE file.
 -->
 <template>
   <span id="entity-filters">
+    <entity-filters-creator :model-value="creatorId"
+      :disabled="disabled" :disabled-message="disabledMessage"
+      @update:model-value="$emit('update:creatorId', $event)"/>
+    <date-range-picker :model-value="creationDate"
+      :label="$t('field.creationDate')"
+      :disabled="disabled" :disabled-message="disabledMessage"
+      :placeholder="$t('allCreationDateSelected')"
+      @update:model-value="$emit('update:creationDate', $event)"/>
     <entity-filters-conflict :model-value="conflict" :disabled="disabled"
       :disabled-message="disabledMessage" @update:model-value="$emit('update:conflict', $event)"/>
   </span>
@@ -18,6 +26,8 @@ except according to the terms contained in the LICENSE file.
 
 <script setup>
 import EntityFiltersConflict from './filters/conflict.vue';
+import EntityFiltersCreator from './filters/creator.vue';
+import DateRangePicker from '../date-range-picker.vue';
 
 defineOptions({
   name: 'EntityFilters'
@@ -34,9 +44,18 @@ defineProps({
   disabledMessage: {
     type: String,
     required: false
+  },
+  creatorId: {
+    type: Array,
+    required: false
+  },
+  creationDate: {
+    type: Array,
+    required: true
   }
 });
-defineEmits(['update:conflict']);
+defineEmits(['update:conflict', 'update:creationDate', 'update:creatorId']);
+
 </script>
 
 <style lang="scss">
@@ -44,3 +63,17 @@ defineEmits(['update:conflict']);
   margin-left: 10px;
 }
 </style>
+
+<i18n lang="json5">
+{
+  "en": {
+    "field": {
+      // This is the text of a form field that allows the user to filter
+      // Entities by a date range.
+      "creationDate": "At"
+    },
+    // @transifexKey component.SubmissionFilters.allSubmissionDateSelected
+    "allCreationDateSelected": "All time"
+  }
+}
+</i18n>
diff --git a/src/components/entity/filters/creator.vue b/src/components/entity/filters/creator.vue
new file mode 100644
index 000000000..4e7a4574d
--- /dev/null
+++ b/src/components/entity/filters/creator.vue
@@ -0,0 +1,131 @@
+<!--
+Copyright 2025 ODK Central Developers
+See the NOTICE file at the top-level directory of this distribution and at
+https://github.com/getodk/central-frontend/blob/master/NOTICE.
+
+This file is part of ODK Central. It is subject to the license terms in
+the LICENSE file found in the top-level directory of this distribution and at
+https://www.apache.org/licenses/LICENSE-2.0. No part of ODK Central,
+including this file, may be copied, modified, propagated, or distributed
+except according to the terms contained in the LICENSE file.
+-->
+<template>
+  <multiselect id="entity-filters-creator" :model-value="selectValue" :options="options"
+    :loading="entityCreators.initiallyLoading" :label="$t('field.creator')" :placeholder="placeholder"
+    :all="$t('action.all')" :none="$t('action.none')" :search="$t('field.search')" :empty="$t('emptyTable')"
+    @update:model-value="update">
+    <template #icon>
+      <span class="icon-user"></span>
+    </template>
+  </multiselect>
+</template>
+
+<script setup>
+import { computed, nextTick, ref, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import Multiselect from '../../multiselect.vue';
+
+import { useRequestData } from '../../../request-data';
+
+defineOptions({
+  name: 'EntityFiltersCreator'
+});
+const props = defineProps({
+  modelValue: {
+    type: Array,
+    required: true
+  }
+});
+const emit = defineEmits(['update:modelValue']);
+
+// The component does not assume that this data will exist when the
+// component is created.
+const { entityCreators } = useRequestData();
+
+const { t } = useI18n();
+const unknown = computed(() => props.modelValue.reduce(
+  (set, id) => (entityCreators.ids.has(id) ? set : set.add(id)),
+  new Set()
+));
+const options = computed(() => {
+  if (!entityCreators.dataExists) return null;
+  const result = new Array(entityCreators.length + unknown.value.size);
+  let i = 0;
+  for (const id of unknown.value) {
+    result[i] = { value: id, text: t('unknown') };
+    i += 1;
+  }
+  for (const { id, displayName } of entityCreators) {
+    result[i] = { value: id, text: displayName };
+    i += 1;
+  }
+  return result;
+});
+
+const selectValue = ref(props.modelValue);
+watch(() => props.modelValue, (value) => { selectValue.value = value; });
+const update = (value) => {
+  if (unknown.value.size !== 0) {
+    // Filter out unknown creators. If that results in no creators, then
+    // fall back to all creators.
+    const withoutUnknown = value.filter(id => !unknown.value.has(id));
+    emit('update:modelValue', withoutUnknown.length !== 0
+      ? withoutUnknown
+      : [...entityCreators.ids]);
+  } else if (value.length !== 0) {
+    emit('update:modelValue', value);
+  } else {
+    // If no creators are selected, then the selection falls back to all
+    // creators. If that's not the selection already, then we emit all
+    // creators. Otherwise, there's no change to emit, but we still need to
+    // make a temporary change to selectValue in order to force the Multiselect
+    // to recheck the checkboxes.
+    const all = [...entityCreators.ids];
+    if (props.modelValue.length !== all.length) {
+      emit('update:modelValue', all);
+    } else {
+      selectValue.value = value;
+      nextTick(() => { selectValue.value = all; });
+    }
+  }
+};
+
+const placeholder = (counts) => {
+  if (counts.total === counts.selected) return t('action.all');
+
+  return counts.selected;
+};
+</script>
+
+<style lang="scss">
+#entity-filters-creator .none {
+  font-style: italic;
+}
+</style>
+
+<i18n lang="json5">
+{
+  "en": {
+    "field": {
+      // This is the text of a form field that shows the names of users that have created Entities.
+      "creator": "Created by",
+      "search": "Search creators…"
+    },
+    "action": {
+      /*
+      This is the text of the button in dropdown menu of entity "created by" filter,
+      that allows the user to select all creators.
+      */
+      "all": "All",
+      /*
+      This is the text of the button in dropdown menu of creator filter,
+      that allows the user to unselect all creators.
+      */
+      "none": "None"
+    },
+    "unknown": "Unknown creator",
+    "emptyTable": "There are no Entities yet."
+  }
+}
+</i18n>
diff --git a/src/components/entity/list.vue b/src/components/entity/list.vue
index 537932e50..23fe47d29 100644
--- a/src/components/entity/list.vue
+++ b/src/components/entity/list.vue
@@ -14,8 +14,8 @@ except according to the terms contained in the LICENSE file.
     <div id="entity-list-actions" class="table-actions-bar">
       <form class="form-inline" @submit.prevent>
         <search-textbox v-model="searchTerm" :label="$t('common.search')" :hide-label="true" :disabled="deleted" :disabled-message="deleted ? $t('searchDisabledMessage') : null"/>
-        <entity-filters v-model:conflict="conflict" :disabled="deleted"
-        :disabled-message="deleted ? $t('filterDisabledMessage') : null"/>
+        <entity-filters v-model:conflict="conflict" v-model:creatorId="creatorIds" v-model:creationDate="creationDateRange"
+        :disabled="deleted" :disabled-message="deleted ? $t('filterDisabledMessage') : null"/>
       </form>
       <button id="entity-list-refresh-button" type="button"
         class="btn btn-outlined" :aria-disabled="refreshing"
@@ -25,13 +25,16 @@ except according to the terms contained in the LICENSE file.
       </button>
       <teleport-if-exists v-if="odataEntities.dataExists" to=".dataset-entities-heading-row">
         <entity-download-button :odata-filter="deleted ? null : odataFilter"
+        :search-term="deleted ? null : searchTerm"
         :disabled="deleted"
         v-tooltip.aria-describedby="deleted ? $t('downloadDisabled') : null"/>
       </teleport-if-exists>
     </div>
     <entity-table v-show="odataEntities.dataExists" ref="table"
-      :properties="dataset.properties"
-      :deleted="deleted" :awaiting-deleted-responses="awaitingResponses"
+      v-model:all-selected="allSelected"
+      :properties="dataset.properties" :deleted="deleted"
+      :awaiting-deleted-responses="awaitingResponses"
+      @selection-changed="handleSelectionChange"
       @update="showUpdate"
       @resolve="showResolve" @delete="showDelete" @restore="showRestore"/>
 
@@ -60,11 +63,21 @@ except according to the terms contained in the LICENSE file.
     <entity-restore v-bind="restoreModal" checkbox
       :awaiting-response="restoreModal.state && awaitingResponses.has(restoreModal.entity.__id)"
       @hide="restoreModal.hide()" @restore="requestRestore"/>
+    <action-bar :state="actionBarState"
+      :message="$tcn('actionBar.message', selectedEntities.size)"
+      :disable-close="bulkOperationInProgress"
+      @hide="clearSelectedEntities()">
+        <button class="btn btn-primary" type="button" :aria-disabled="bulkOperationInProgress" @click="requestBulkDelete">
+          <span class="icon-trash"></span>
+          {{ $t('action.delete') }}
+          <spinner :state="bulkOperationInProgress"/>
+        </button>
+    </action-bar>
   </div>
 </template>
 
 <script>
-import { reactive } from 'vue';
+import { reactive, watch } from 'vue';
 
 import EntityDownloadButton from './download-button.vue';
 import EntityDelete from './delete.vue';
@@ -78,18 +91,22 @@ import Spinner from '../spinner.vue';
 import Pagination from '../pagination.vue';
 import TeleportIfExists from '../teleport-if-exists.vue';
 import SearchTextbox from '../search-textbox.vue';
+import ActionBar from '../action-bar.vue';
 
 import useQueryRef from '../../composables/query-ref';
+import useDateRangeQueryRef from '../../composables/date-range-query-ref';
 import useRequest from '../../composables/request';
-import { apiPaths } from '../../util/request';
+import { apiPaths, requestAlertMessage } from '../../util/request';
 import { modalData } from '../../util/reactivity';
 import { noop } from '../../util/util';
 import { odataEntityToRest } from '../../util/odata';
 import { useRequestData } from '../../request-data';
+import { arrayQuery } from '../../util/router';
 
 export default {
   name: 'EntityList',
   components: {
+    ActionBar,
     EntityDelete,
     EntityDownloadButton,
     EntityRestore,
@@ -103,7 +120,7 @@ export default {
     Spinner,
     TeleportIfExists
   },
-  inject: ['alert'],
+  inject: ['alert', 'container'],
   props: {
     projectId: {
       type: String,
@@ -122,7 +139,7 @@ export default {
   setup() {
     // The dataset request object is how we get access to the
     // dataset properties for the columns.
-    const { dataset, deletedEntityCount, odataEntities } = useRequestData();
+    const { dataset, deletedEntityCount, odataEntities, entityCreators } = useRequestData();
 
     // Array of conflict statuses, where a conflict status is represented as a
     // boolean
@@ -142,11 +159,37 @@ export default {
       })
     });
 
+    const creatorIds = useQueryRef({
+      fromQuery: (query) => {
+        const stringIds = arrayQuery(query.creatorId, {
+          validator: (value) => /^[1-9]\d*$/.test(value)
+        });
+        return stringIds.length !== 0
+          ? stringIds.map(id => Number.parseInt(id, 10))
+          : (entityCreators.dataExists ? [...entityCreators.ids] : []);
+      },
+      toQuery: (value) => ({
+        creatorId: value.length === entityCreators.length
+          ? []
+          : value.map(id => id.toString())
+      })
+    });
+    watch(() => entityCreators.dataExists, () => {
+      if (creatorIds.value.length === 0 && entityCreators.length !== 0)
+        creatorIds.value = [...entityCreators.ids];
+    });
+
+    const creationDateRange = useDateRangeQueryRef();
+
     const { request } = useRequest();
 
     const pageSizeOptions = [250, 500, 1000];
 
-    return { dataset, odataEntities, conflict, request, deletedEntityCount, pageSizeOptions, searchTerm };
+    return {
+      dataset, odataEntities, conflict, request,
+      deletedEntityCount, pageSizeOptions, searchTerm, entityCreators, creatorIds,
+      creationDateRange
+    };
   },
   data() {
     return {
@@ -173,13 +216,40 @@ export default {
       pagination: { page: 0, size: this.pageSizeOptions[0], count: 0 },
       now: new Date().toISOString(),
       snapshotFilter: '',
+      // used for restoring them back when undo button is pressed
+      bulkDeletedEntities: [],
+      selectedEntities: new Set(),
+      bulkOperationInProgress: false,
+
+      allSelected: false
     };
   },
   computed: {
+    filtersOnCreatorId() {
+      if (this.creatorIds.length === 0) return false;
+      const selectedAll = this.entityCreators.dataExists &&
+        this.creatorIds.length === this.entityCreators.length &&
+        this.creatorIds.every(id => this.entityCreators.ids.has(id));
+      return !selectedAll;
+    },
     odataFilter() {
-      return this.conflict.length === 2
-        ? null
-        : (this.conflict[0] ? '__system/conflict ne null' : '__system/conflict eq null');
+      const conditions = [];
+      if (this.filtersOnCreatorId) {
+        const condition = this.creatorIds
+          .map(id => `__system/creatorId eq ${id}`)
+          .join(' or ');
+        conditions.push(`(${condition})`);
+      }
+      if (this.creationDateRange.length !== 0) {
+        const start = this.creationDateRange[0].toISO();
+        const end = this.creationDateRange[1].endOf('day').toISO();
+        conditions.push(`__system/createdAt ge ${start}`);
+        conditions.push(`__system/createdAt le ${end}`);
+      }
+      if (this.conflict.length === 1) {
+        conditions.push(this.conflict[0] ? '__system/conflict ne null' : '__system/conflict eq null');
+      }
+      return conditions.length !== 0 ? conditions.join(' and ') : null;
     },
     emptyTableMessage() {
       if (!this.odataEntities.dataExists) return '';
@@ -193,12 +263,20 @@ export default {
       }
       return this.deleted ? this.$t('deletedEntity.emptyTable')
         : (this.odataFilter ? this.$t('noMatching') : this.$t('noEntities'));
+    },
+    actionBarState() {
+      return this.selectedEntities.size > 0 && !this.alert.state && !this.container.openModal.state;
     }
   },
   watch: {
     deleted() {
       this.fetchChunk(true);
     },
+    'odataEntities.value': {
+      handler() {
+        this.clearSelectedEntities();
+      }
+    },
     'odataEntities.count': {
       handler() {
         if (this.dataset.dataExists && this.odataEntities.dataExists && !this.odataFilter && !this.deleted && !this.searchTerm)
@@ -211,11 +289,36 @@ export default {
           this.dataset.entities = this.odataEntities.count - size;
         }
       }
+    },
+    'selectedEntities.size': {
+      handler(size) {
+        if (size > 0) {
+          this.alert.last.hide();
+        }
+      }
+    },
+    // Hide the action bar if any alert is raised.
+    'alert.state': {
+      handler(state) {
+        if (!state) {
+          // since alert is hidden, we no longer need to keep bulkDeletedEntities list as there is
+          // no longer a way to undo bulk delete
+          this.bulkDeletedEntities.length = 0;
+        }
+      }
+    },
+    actionBarState(state) {
+      // only if all rows are unselected, this doesn't happen when a modal is shown
+      if (!state && this.selectedEntities.size === 0) {
+        this.allSelected = false;
+      }
     }
+
   },
   created() {
     this.fetchChunk(true);
     this.$watch(() => [this.odataFilter, this.searchTerm], () => this.fetchChunk(true));
+    this.fetchCreators();
   },
   methods: {
     // `clear` indicates whether this.odataEntities should be cleared before
@@ -296,6 +399,11 @@ export default {
         this.searchTerm = '';
       }
     },
+    fetchCreators() {
+      this.entityCreators.request({
+        url: apiPaths.entityCreators(this.projectId, this.datasetName)
+      }).catch(noop);
+    },
     showUpdate(index) {
       if (this.refreshing) return;
       this.updateIndex = index;
@@ -404,6 +512,7 @@ export default {
             : -1;
           if (index !== -1) {
             this.$refs.table.afterDelete(index);
+            this.selectedEntities.delete(this.odataEntities.value[index]);
             this.odataEntities.value.splice(index, 1);
           }
         })
@@ -458,6 +567,111 @@ export default {
       // less than the lowest size option, hence we don't need to make a request.
       if (this.odataEntities.count < this.pageSizeOptions[0]) return;
       this.fetchChunk(false);
+    },
+    clearSelectedEntities() {
+      this.selectedEntities.clear();
+      this.odataEntities.value?.forEach(e => { e.__system.selected = false; });
+      this.allSelected = false;
+    },
+    requestBulkDelete() {
+      const uuids = Array.from(this.selectedEntities).map(e => e.__id);
+      // TODO: disable the whole table
+
+      const bulkDelete = () => {
+        this.bulkOperationInProgress = true;
+        return this.request({
+          method: 'POST',
+          url: apiPaths.entities(this.projectId, this.datasetName, '/bulk-delete'),
+          alert: false,
+          data: {
+            ids: uuids
+          }
+        }).finally(() => {
+          this.bulkOperationInProgress = false;
+        });
+      };
+
+      const onSuccess = () => {
+        if (this.deletedEntityCount.dataExists) this.deletedEntityCount.value += uuids.length;
+
+        uuids.forEach(uuid => this.odataEntities.removedEntities.add(uuid));
+
+        this.bulkDeletedEntities = [...this.selectedEntities];
+        this.odataEntities.value = this.odataEntities.value.filter(e => !this.selectedEntities.has(e));
+        this.alert.success(this.$tcn('alert.bulkDelete', this.selectedEntities.size))
+          .cta(this.$t('action.undo'), () => this.requestBulkRestore(uuids));
+        this.selectedEntities.clear();
+      };
+
+      bulkDelete()
+        .then(onSuccess)
+        .catch((error) => {
+          const { cta } = this.alert.danger(requestAlertMessage(this.$i18n, error));
+          cta(this.$t('action.tryAgain'), () => bulkDelete()
+            .then(() => {
+              onSuccess();
+              return true;
+            })
+            .catch(noop));
+        });
+    },
+    requestBulkRestore() {
+      const uuids = this.bulkDeletedEntities.map(e => e.__id);
+      const bulkRestore = () => {
+        this.bulkOperationInProgress = true;
+        return this.request({
+          method: 'POST',
+          url: apiPaths.entities(this.projectId, this.datasetName, '/bulk-restore'),
+          alert: false,
+          data: {
+            ids: uuids
+          }
+        }).finally(() => {
+          this.bulkOperationInProgress = false;
+        });
+      };
+
+      const onSuccess = () => {
+        this.bulkDeletedEntities.forEach(e => {
+          e.__system.selected = false;
+        });
+        const combined = [
+          ...this.odataEntities.value,
+          ...this.bulkDeletedEntities
+        ];
+
+        this.odataEntities.value = combined.sort((a, b) =>
+          b.__system.rowNumber - a.__system.rowNumber);
+
+        this.bulkDeletedEntities.length = 0;
+        if (this.deletedEntityCount.dataExists) this.deletedEntityCount.value -= uuids.length;
+        uuids.forEach(uuid => this.odataEntities.removedEntities.delete(uuid));
+        this.alert.success(this.$tcn('alert.restored', uuids.length));
+      };
+
+      bulkRestore()
+        .then(onSuccess)
+        .catch((error) => {
+          const { cta } = this.alert.danger(requestAlertMessage(this.$i18n, error));
+          cta(this.$t('action.tryAgain'), () => bulkRestore()
+            .then(() => {
+              onSuccess();
+              return true;
+            })
+            .catch(noop));
+        });
+    },
+    handleSelectionChange(entity, selected) {
+      if (entity === 'all') {
+        this.selectedEntities.clear();
+        if (selected) {
+          this.odataEntities.value.forEach(e => this.selectedEntities.add(e));
+        }
+      } else if (selected) {
+        this.selectedEntities.add(entity);
+      } else {
+        this.selectedEntities.delete(entity);
+      }
     }
   }
 };
@@ -499,7 +713,9 @@ export default {
     "allDeleted": "All Entities are deleted.",
     "allDeletedOnPage": "All Entities on the page have been deleted.",
     "alert": {
-      "delete": "Entity “{label}” has been deleted."
+      "delete": "Entity “{label}” has been deleted.",
+      "bulkDelete": "{count} Entity successfully deleted. | {count} Entities successfully deleted.",
+      "restored": "{count} Entity successfully restored. | {count} Entities successfully restored.",
     },
     "filterDisabledMessage": "Filtering is unavailable for deleted Entities",
     "searchDisabledMessage": "Search is unavailable for deleted Entities",
@@ -508,6 +724,9 @@ export default {
       "emptyTable": "There are no deleted Entities.",
       "allRestored": "All deleted Entities are restored.",
       "allRestoredOnPage": "All Entities on the page have been restored."
+    },
+    "actionBar": {
+      "message": "{count} Entity selected | {count} Entities selected"
     }
   }
 }
diff --git a/src/components/entity/metadata-row.vue b/src/components/entity/metadata-row.vue
index 979a1996e..a88e16982 100644
--- a/src/components/entity/metadata-row.vue
+++ b/src/components/entity/metadata-row.vue
@@ -10,8 +10,11 @@ including this file, may be copied, modified, propagated, or distributed
 except according to the terms contained in the LICENSE file.
 -->
 <template>
-  <tr class="entity-metadata-row">
+  <tr class="entity-metadata-row" :class="{ 'entity-row-selected': entity.__system.selected }">
     <td class="row-number">{{ $n(rowNumber, 'noGrouping') }}</td>
+    <td v-if="!deleted">
+      <input type="checkbox" :aria-label="$t('action.selectRow')" :checked="entity.__system.selected" @change="$emit('selectionChanged', $event.target.checked)">
+    </td>
     <td class="creator-name">
       <span v-tooltip.text>{{ entity.__system.creatorName }}</span>
     </td>
@@ -103,6 +106,7 @@ const props = defineProps({
   },
   awaitingResponse: Boolean
 });
+defineEmits(['selectionChanged']);
 const projectId = inject('projectId');
 const datasetName = inject('datasetName');
 
@@ -116,6 +120,12 @@ const { entityPath } = useRoutes();
 
 <style lang="scss">
 @import '../../assets/scss/mixins';
+@import '../../assets/scss/variables';
+
+
+.entity-row-selected {
+  background-color: $color-selected-row;
+}
 
 .entity-metadata-row {
   .creator-name {
diff --git a/src/components/entity/table.vue b/src/components/entity/table.vue
index 815f79b0e..f2643a0ad 100644
--- a/src/components/entity/table.vue
+++ b/src/components/entity/table.vue
@@ -15,6 +15,9 @@ except according to the terms contained in the LICENSE file.
     :frozen-only="properties == null" divider @action="afterAction">
     <template #head-frozen>
       <th><span class="sr-only">{{ $t('common.rowNumber') }}</span></th>
+      <th v-if="!deleted">
+        <input type="checkbox" :aria-label="$t('action.selectRow')" :checked="allSelected" @change="changeAllSelection($event.target.checked)">
+      </th>
       <th>{{ $t('header.createdBy') }}</th>
       <th>{{ $t('header.createdAt') }}</th>
       <th v-if="!deleted">{{ $t('header.updatedAtAndActions') }}</th>
@@ -30,11 +33,12 @@ except according to the terms contained in the LICENSE file.
       <th>{{ $t('entity.entityId') }}</th>
     </template>
 
-    <template #data-frozen="{ data }">
+    <template #data-frozen="{ data, index }">
       <entity-metadata-row :entity="data"
         :row-number="data.__system.rowNumber"
         :verbs="project.verbs" :deleted="deleted"
-        :awaiting-response="awaitingDeletedResponses.has(data.__id)"/>
+        :awaiting-response="awaitingDeletedResponses.has(data.__id)"
+        @selection-changed="handleSelectionChanged($event, index)"/>
     </template>
     <template #data-scrolling="{ data }">
       <entity-data-row :entity="data" :properties="properties"/>
@@ -64,9 +68,11 @@ defineProps({
   awaitingDeletedResponses: {
     type: Set,
     required: true
-  }
+  },
+  allSelected: Boolean
 });
-const emit = defineEmits(['update', 'resolve', 'delete', 'restore']);
+const emit = defineEmits(['update', 'resolve', 'delete', 'restore', 'selectionChanged', 'update:allSelected']);
+
 
 // The component does not assume that this data will exist when the component is
 // created.
@@ -87,6 +93,25 @@ const table = ref(null);
 const afterUpdate = (index) => { markRowsChanged(table.value.getRowPair(index)); };
 const afterDelete = (index) => { markRowsDeleted(table.value.getRowPair(index)); };
 defineExpose({ afterUpdate, afterDelete });
+
+const handleSelectionChanged = (checked, index) => {
+  const data = odataEntities.value[index];
+  data.__system.selected = checked;
+
+  // If unchecking any item, uncheck the header
+  if (!checked) {
+    emit('update:allSelected', false);
+  }
+  emit('selectionChanged', data, checked);
+};
+
+const changeAllSelection = (checked) => {
+  emit('update:allSelected', checked);
+  odataEntities.value.forEach(e => {
+    e.__system.selected = checked;
+  });
+  emit('selectionChanged', 'all', checked);
+};
 </script>
 
 <style lang="scss">
@@ -101,6 +126,10 @@ defineExpose({ afterUpdate, afterDelete });
     }
   }
 
+  input[type="checkbox"] {
+    margin-top: 0;
+  }
+
 th.col-deleted-at { color: $color-danger; }
 }
 </style>
diff --git a/src/components/form/settings.vue b/src/components/form/settings.vue
index 907079acf..585196eae 100644
--- a/src/components/form/settings.vue
+++ b/src/components/form/settings.vue
@@ -77,7 +77,7 @@ except according to the terms contained in the LICENSE file.
     </div>
     <form-delete v-bind="deleteModal" @hide="deleteModal.hide()"
       @success="afterDelete"/>
-    <form-web-forms-settings-confirmation v-bind="confirmationModal" @hide="hideAndReset" @success="confirmationModal.hide()"/>
+    <form-web-forms-settings-confirmation v-bind="confirmationModal" @hide="hideAndReset" @success="afterSettingChanged"/>
   </div>
 </template>
 
@@ -97,6 +97,7 @@ defineOptions({
 });
 
 const alert = inject('alert');
+const toast = inject('toast');
 
 const { t } = useI18n();
 const router = useRouter();
@@ -112,11 +113,20 @@ const afterDelete = () => {
     .then(() => { alert.success(message); });
 };
 
+
 const webformsEnabled = ref(form.webformsEnabled);
 watch(() => form.dataExists, () => {
   webformsEnabled.value = form.webformsEnabled;
 });
 
+const afterSettingChanged = () => {
+  const message = webformsEnabled.value
+    ? t('webFormsSetting.owfSelected', { formName: form.nameOrId })
+    : t('webFormsSetting.enketoSelected', { formName: form.nameOrId });
+  toast.show(message);
+  confirmationModal.hide();
+};
+
 const hideAndReset = () => {
   webformsEnabled.value = form.webformsEnabled;
   confirmationModal.hide();
@@ -180,7 +190,11 @@ const hideAndReset = () => {
       // Description of a section. {formName} is replaced with the name of the Form
       "description": "Fill out, preview and edit your “{formName}” Form using",
       // The word "Enketo" should not be translated
-      "enketoDefault": "Enketo (default)"
+      "enketoDefault": "Enketo (default)",
+      // Success message when Enketo is selected as web form technology. {formName} is replaced with the name of the Form
+      "enketoSelected": "You’re now using Enketo to fill out, preview and edit your “{formName}” form.",
+      // Success message when ODK Web Forms is selected as web form technology. {formName} is replaced with the name of the Form
+      "owfSelected": "You’re now using ODK Web Forms to fill out, preview and edit your “{formName}” form."
     }
   }
 }
diff --git a/src/components/form/submissions.vue b/src/components/form/submissions.vue
index 86a7bab9d..a22c9b5b8 100644
--- a/src/components/form/submissions.vue
+++ b/src/components/form/submissions.vue
@@ -27,15 +27,15 @@ except according to the terms contained in the LICENSE file.
             </button>
           </template>
           <p v-show="deleted" class="purge-description">{{ $t('purgeDescription') }}</p>
-          <odata-data-access :analyze-disabled="analyzeDisabled"
+          <odata-data-access :analyze-disabled="hasEncryption || deleted"
             :analyze-disabled-message="analyzeDisabledMessage"
             @analyze="analyzeModal.show()"/>
         </div>
         </template>
       <template #body>
         <submission-list ref="submissionList" :project-id="projectId"
-          :xml-form-id="xmlFormId" :deleted="deleted" @fetch-keys="fetchKeys"
-          @fetch-deleted-count="fetchDeletedCount"/>
+          :xml-form-id="xmlFormId" :deleted="deleted" :encrypted="hasEncryption"
+          @fetch-keys="fetchKeys" @fetch-deleted-count="fetchDeletedCount"/>
       </template>
     </page-section>
     <odata-analyze v-bind="analyzeModal" :odata-url="odataUrl"
@@ -116,20 +116,18 @@ export default {
         this.project.permits('submission.create') && this.form.dataExists;
     },
     /*
-    Disable the "Analyze via OData" button if:
+    Disable some functionality (e.g., the "Analyze via OData" button) if:
 
       - There are encrypted submissions, or
       - There are no submissions yet, but the form is encrypted. In that case,
         there will never be decrypted submissions available to OData (as long as
-        the form remains encrypted), or
-      - Showing deleted Submissions
+        the form remains encrypted).
     */
-    analyzeDisabled() {
+    hasEncryption() {
       if (this.keys.dataExists && this.keys.length !== 0) return true;
       if (this.form.dataExists && this.form.keyId != null &&
         this.form.submissions === 0)
         return true;
-      if (this.deleted) return true;
       return false;
     },
     analyzeDisabledMessage() {
@@ -167,8 +165,11 @@ export default {
       }).catch(noop);
     },
     toggleDeleted() {
-      const { path } = this.$route;
-      this.$router.push(this.deleted ? path : `${path}?deleted=true`);
+      const query = {};
+      if (!this.deleted) query.deleted = 'true';
+      if (this.$route.query.map === 'true') query.map = 'true';
+
+      this.$router.push({ path: this.$route.path, query });
     }
   }
 };
diff --git a/src/components/geojson-map.vue b/src/components/geojson-map.vue
new file mode 100644
index 000000000..40ac2f278
--- /dev/null
+++ b/src/components/geojson-map.vue
@@ -0,0 +1,37 @@
+<!--
+Copyright 2025 ODK Central Developers
+See the NOTICE file at the top-level directory of this distribution and at
+https://github.com/getodk/central-frontend/blob/master/NOTICE.
+
+This file is part of ODK Central. It is subject to the license terms in
+the LICENSE file found in the top-level directory of this distribution and at
+https://www.apache.org/licenses/LICENSE-2.0. No part of ODK Central,
+including this file, may be copied, modified, propagated, or distributed
+except according to the terms contained in the LICENSE file.
+-->
+<template>
+  <div class="geojson-map">
+    <p>GeoJSON loaded!</p>
+
+    <button v-if="json == null" type="button" class="btn btn-primary"
+      @click="showJson">
+      Show JSON
+    </button>
+    <pre v-else><code>{{ json }}</code></pre>
+  </div>
+</template>
+
+<script setup>
+import { ref, watch } from 'vue';
+
+const props = defineProps({
+  features: {
+    type: Object,
+    required: true
+  }
+});
+
+const json = ref(null);
+const showJson = () => { json.value = JSON.stringify(props.features, null, 2); };
+watch(() => props.features, () => { json.value = null; });
+</script>
diff --git a/src/components/radio-field.vue b/src/components/radio-field.vue
new file mode 100644
index 000000000..18a47fcc2
--- /dev/null
+++ b/src/components/radio-field.vue
@@ -0,0 +1,49 @@
+<!--
+Copyright 2025 ODK Central Developers
+See the NOTICE file at the top-level directory of this distribution and at
+https://github.com/getodk/central-frontend/blob/master/NOTICE.
+
+This file is part of ODK Central. It is subject to the license terms in
+the LICENSE file found in the top-level directory of this distribution and at
+https://www.apache.org/licenses/LICENSE-2.0. No part of ODK Central,
+including this file, may be copied, modified, propagated, or distributed
+except according to the terms contained in the LICENSE file.
+-->
+<template>
+  <div class="radio-field"
+    v-tooltip.no-aria="disabled ? disabledMessage : null">
+    <div v-for="{ value, text } of options" :key="value" class="radio"
+      :class="{ disabled }">
+      <label>
+        <input v-model="model" type="radio" :value="value" :disabled="disabled"
+          :aria-describedby="disabledMessageId">
+        <span>{{ text }}</span>
+      </label>
+    </div>
+    <p v-if="disabledMessageId != null" :id="disabledMessageId" class="sr-only">
+      {{ disabledMessage }}
+    </p>
+  </div>
+</template>
+
+<script>
+let nextId = 0;
+</script>
+<script setup>
+import { computed } from 'vue';
+
+const model = defineModel({ required: true });
+const props = defineProps({
+  options: {
+    type: Array,
+    required: true
+  },
+  disabled: Boolean,
+  disabledMessage: String
+});
+
+const id = nextId;
+nextId += 1;
+const disabledMessageId = computed(() =>
+  (props.disabled && props.disabledMessage != null ? `radio-field-disabled${id}` : null));
+</script>
diff --git a/src/components/submission/filters.vue b/src/components/submission/filters.vue
index baa3b2a19..bb53a4c2a 100644
--- a/src/components/submission/filters.vue
+++ b/src/components/submission/filters.vue
@@ -71,7 +71,7 @@ export default {
       // Submissions by a date range.
       "submissionDate": "Submitted at"
     },
-    // Text shown when in Submission date filter when Submissions for all dates are shown
+    // Text shown when in date filter when records for all dates are shown
     "allSubmissionDateSelected": "All time"
   }
 }
diff --git a/src/components/submission/list.vue b/src/components/submission/list.vue
index 09ab6f5dd..95b646b35 100644
--- a/src/components/submission/list.vue
+++ b/src/components/submission/list.vue
@@ -33,15 +33,18 @@ except according to the terms contained in the LICENSE file.
         <!-- TODO: merge these two forms -->
         <form v-if="!draft" class="form-inline field-dropdown-form" @submit.prevent>
           <submission-field-dropdown
-          v-if="selectedFields != null && fields.selectable.length > 11"
-          v-model="selectedFields"/>
+            v-if="selectedFields != null && fields.selectable.length > 11"
+            v-model="selectedFields"/>
         </form>
         <button id="submission-list-refresh-button" type="button"
-          class="btn btn-outlined move-right" :aria-disabled="refreshing"
-          @click="fetchChunk(false, true)">
+          class="btn btn-outlined" :aria-disabled="refreshing"
+          @click="refresh">
           <span class="icon-refresh"></span>{{ $t('action.refresh') }}
           <spinner :state="refreshing"/>
         </button>
+        <radio-field v-if="!draft && fields.dataExists && fields.hasMappable"
+          v-model="dataView" :options="viewOptions" :disabled="encrypted"
+          :disabled-message="$t('noMapEncryption')"/>
         <teleport-if-exists v-if="formVersion.dataExists && odata.dataExists"
           :to="'.form-submissions-heading-row'">
           <submission-download-button :form-version="formVersion"
@@ -52,29 +55,21 @@ except according to the terms contained in the LICENSE file.
             @download-filtered="showDownloadModal(true)"/>
         </teleport-if-exists>
       </div>
-      <submission-table v-show="odata.dataExists"
-        ref="table" :project-id="projectId" :xml-form-id="xmlFormId"
-        :draft="draft" :fields="selectedFields"
-        :deleted="deleted" :awaiting-deleted-responses="awaitingResponses"
+
+      <submission-table-view v-if="dataView === 'table'" ref="view"
+        :project-id="projectId" :xml-form-id="xmlFormId" :draft="draft" :deleted="deleted"
+        :filter="odataFilter" :fields="selectedFields"
+        :refreshing="refreshing" :total-count="formVersion.submissions"
+        :awaiting-responses="awaitingResponses"
         @review="reviewModal.show({ submission: $event })"
         @delete="showDelete"
         @restore="showRestore"/>
+      <submission-map-view v-else ref="view"
+        :project-id="projectId" :xml-form-id="xmlFormId" :deleted="deleted"
+        :filter="geojsonFilter" :refreshing="refreshing"/>
       <p v-show="emptyTableMessage" class="empty-table-message">
         {{ emptyTableMessage }}
       </p>
-      <odata-loading-message type="submission"
-        :top="pagination.size"
-        :odata="odata"
-        :filter="!!odataFilter"
-        :refreshing="refreshing"
-        :total-count="formVersion.dataExists ? formVersion.submissions : 0"/>
-
-        <!-- @update:page is emitted on size change as well -->
-        <pagination v-if="pagination.count > 0"
-              v-model:page="pagination.page" v-model:size="pagination.size"
-              :count="pagination.count" :size-options="pageSizeOptions"
-              :spinner="odata.awaitingResponse"
-              @update:page="handlePageChange()"/>
     </div>
 
     <submission-download v-bind="downloadModal" :form-version="formVersion"
@@ -92,26 +87,26 @@ except according to the terms contained in the LICENSE file.
 </template>
 
 <script>
-import { DateTime } from 'luxon';
-import { shallowRef, watch, reactive } from 'vue';
+import { shallowRef, watch } from 'vue';
 
 import EnketoFill from '../enketo/fill.vue';
 import Loading from '../loading.vue';
 import Spinner from '../spinner.vue';
-import OdataLoadingMessage from '../odata-loading-message.vue';
+import RadioField from '../radio-field.vue';
+import SubmissionDelete from './delete.vue';
 import SubmissionDownload from './download.vue';
 import SubmissionDownloadButton from './download-button.vue';
 import SubmissionFieldDropdown from './field-dropdown.vue';
 import SubmissionFilters from './filters.vue';
-import SubmissionTable from './table.vue';
-import SubmissionUpdateReviewState from './update-review-state.vue';
-import SubmissionDelete from './delete.vue';
+import SubmissionMapView from './map-view.vue';
 import SubmissionRestore from './restore.vue';
-import Pagination from '../pagination.vue';
+import SubmissionTableView from './table-view.vue';
+import SubmissionUpdateReviewState from './update-review-state.vue';
 import TeleportIfExists from '../teleport-if-exists.vue';
 
 import useFields from '../../request-data/fields';
 import useQueryRef from '../../composables/query-ref';
+import useDateRangeQueryRef from '../../composables/date-range-query-ref';
 import useReviewState from '../../composables/review-state';
 import useRequest from '../../composables/request';
 import { apiPaths } from '../../util/request';
@@ -126,16 +121,16 @@ export default {
   components: {
     EnketoFill,
     Loading,
-    OdataLoadingMessage,
-    Pagination,
+    RadioField,
     Spinner,
     SubmissionDelete,
     SubmissionDownload,
     SubmissionDownloadButton,
     SubmissionFieldDropdown,
     SubmissionFilters,
+    SubmissionMapView,
     SubmissionRestore,
-    SubmissionTable,
+    SubmissionTableView,
     SubmissionUpdateReviewState,
     TeleportIfExists
   },
@@ -150,10 +145,8 @@ export default {
       required: true
     },
     draft: Boolean,
-    deleted: {
-      type: Boolean,
-      required: false
-    }
+    deleted: Boolean,
+    encrypted: Boolean
   },
   emits: ['fetch-keys', 'fetch-deleted-count', 'toggle-qr'],
   setup(props) {
@@ -163,6 +156,7 @@ export default {
       : form;
     const fields = useFields();
 
+    // Filter query parameters
     const submitterIds = useQueryRef({
       fromQuery: (query) => {
         const stringIds = arrayQuery(query.submitterId, {
@@ -182,20 +176,7 @@ export default {
       if (submitterIds.value.length === 0 && submitters.length !== 0)
         submitterIds.value = [...submitters.ids];
     });
-    const submissionDateRange = useQueryRef({
-      fromQuery: (query) => {
-        if (typeof query.start === 'string' && typeof query.end === 'string') {
-          const start = DateTime.fromISO(query.start);
-          const end = DateTime.fromISO(query.end);
-          if (start.isValid && end.isValid && start <= end)
-            return [start.startOf('day'), end.startOf('day')];
-        }
-        return [];
-      },
-      toQuery: (value) => (value.length !== 0
-        ? { start: value[0].toISODate(), end: value[1].toISODate() }
-        : { start: null, end: null })
-    });
+    const submissionDateRange = useDateRangeQueryRef();
     const { reviewStates: allReviewStates } = useReviewState();
     const reviewStates = useQueryRef({
       fromQuery: (query) => arrayQuery(query.reviewState, {
@@ -207,14 +188,18 @@ export default {
         reviewState: value.length === allReviewStates.length ? [] : value
       })
     });
-    const { request } = useRequest();
 
-    const pageSizeOptions = [250, 500, 1000];
+    const dataView = useQueryRef({
+      fromQuery: (query) => (query.map === 'true' ? 'map' : 'table'),
+      toQuery: (value) => ({ map: value === 'map' ? 'true' : null })
+    });
+
+    const { request } = useRequest();
 
     return {
       form, keys, fields, formVersion, odata, submitters, deletedSubmissionCount,
-      submitterIds, submissionDateRange, reviewStates, allReviewStates,
-      request, pageSizeOptions
+      submitterIds, submissionDateRange, reviewStates, allReviewStates, dataView,
+      request
     };
   },
   data() {
@@ -237,14 +222,16 @@ export default {
       // state that indicates whether we need to show restore confirmation dialog
       confirmRestore: true,
 
-      awaitingResponses: new Set(),
-
-      pagination: { page: 0, size: this.pageSizeOptions[0], count: 0 },
-      now: new Date().toISOString(),
-      snapshotFilter: ''
+      awaitingResponses: new Set()
     };
   },
   computed: {
+    viewOptions() {
+      return [
+        { value: 'table', text: this.$t('common.table') },
+        { value: 'map', text: this.$t('common.map') }
+      ];
+    },
     filtersOnSubmitterId() {
       if (this.submitterIds.length === 0) return false;
       const selectedAll = this.submitters.dataExists &&
@@ -276,11 +263,20 @@ export default {
       }
       return conditions.length !== 0 ? conditions.join(' and ') : null;
     },
-    odataSelect() {
-      if (this.selectedFields == null) return null;
-      const paths = this.selectedFields.map(({ path }) => path.replace('/', ''));
-      paths.unshift('__id', '__system');
-      return paths.join(',');
+    geojsonFilter() {
+      if (this.draft) return null;
+      const query = {};
+      if (this.filtersOnSubmitterId) query.submitterId = this.submitterIds;
+      if (this.submissionDateRange.length !== 0) {
+        query.start__gte = this.submissionDateRange[0].toISO();
+        query.end__lte = this.submissionDateRange[1].endOf('day').toISO();
+      }
+      if (this.reviewStates.length !== this.allReviewStates.length) {
+        query.reviewState = this.reviewStates.map(reviewState =>
+          // Undo odataLiteral(): remove quotes.
+          (reviewState === 'null' ? reviewState : reviewState.slice(1, -1)));
+      }
+      return Object.keys(query).length !== 0 ? query : null;
     },
     emptyTableMessage() {
       if (!this.odata.dataExists) return '';
@@ -297,18 +293,26 @@ export default {
     }
   },
   watch: {
-    odataFilter() {
-      this.fetchChunk(true);
-    },
-    selectedFields(_, oldFields) {
-      if (oldFields != null) this.fetchChunk(true);
-    },
-    deleted() {
-      this.fetchChunk(true);
+    dataView() {
+      /* Both view components set this.odata, but they don't reset this.odata
+      when they're unmounted. It's important for this.odata to be reset,
+      especially when toggling from table view to map view. Map view doesn't
+      modify this.odata at all until after the GeoJSON response is received.
+      That means that if this.odata isn't reset, the stale data from the table
+      view could persist for a bit, affecting things like
+      this.emptyTableMessage. */
+      this.odata.reset();
     },
     'odata.count': {
       handler() {
-        if (this.formVersion.dataExists && this.odata.dataExists && !this.odataFilter)
+        // Update this.formVersion.submissions to match this.odata.count.
+        // this.odata.count is more likely to be up-to-date, since it's
+        // refreshed more frequently. We don't update this.formVersion if
+        // this.odata is a subset of submissions. That includes when the map
+        // view sets this.odata, as some submissions might not have geo data and
+        // won't appear on the map.
+        if (this.formVersion.dataExists && this.odata.dataExists &&
+          this.dataView === 'table' && !this.odataFilter)
           this.formVersion.submissions = this.odata.count;
       }
     },
@@ -324,67 +328,6 @@ export default {
     this.fetchData();
   },
   methods: {
-    // `clear` indicates whether this.odata should be cleared before sending the
-    // request. `refresh` indicates whether the request is a background refresh.
-    fetchChunk(clear, refresh = false) {
-      this.refreshing = refresh;
-      // Are we fetching the first chunk of submissions or the next chunk?
-      const first = clear || refresh;
-
-      if (first) {
-        this.now = new Date().toISOString();
-        this.setSnapshotFilter();
-        this.pagination.page = 0;
-      }
-
-      let $filter = this.snapshotFilter;
-      if (this.odataFilter) {
-        $filter += ` and ${this.odataFilter}`;
-      }
-
-      this.odata.request({
-        url: apiPaths.odataSubmissions(
-          this.projectId,
-          this.xmlFormId,
-          this.draft,
-          {
-            $top: this.pagination.size,
-            $skip: this.pagination.page * this.pagination.size,
-            $count: true,
-            $wkt: true,
-            $filter,
-            $select: this.odataSelect,
-            $orderby: '__system/submissionDate desc'
-          }
-        ),
-        clear,
-        patch: !first
-          ? (response) => this.odata.replaceData(response.data, response.config)
-          : null
-      })
-        .then(() => {
-          this.pagination.count = this.odata.count;
-
-          if (this.deleted) {
-            this.deletedSubmissionCount.cancelRequest();
-            if (!this.deletedSubmissionCount.dataExists) {
-              this.deletedSubmissionCount.data = reactive({});
-            }
-            this.deletedSubmissionCount.value = this.odata.count;
-          }
-        })
-        .finally(() => { this.refreshing = false; })
-        .catch(noop);
-
-      // emit event to parent component to re-fetch deleted Submissions count
-      if (refresh && !this.deleted && !this.draft) {
-        this.$emit('fetch-deleted-count');
-      }
-
-      // emit event to parent component to re-fetch keys if needed
-      if (refresh && this.formVersion.keyId != null && this.keys.length === 0)
-        this.$emit('fetch-keys');
-    },
     fetchData() {
       this.fields.request({
         url: apiPaths.fields(this.projectId, this.xmlFormId, this.draft, {
@@ -398,23 +341,23 @@ export default {
             : this.fields.selectable.slice(0, 10);
         })
         .catch(noop);
-      this.fetchChunk(true);
       if (!this.draft) {
         this.submitters.request({
           url: apiPaths.submitters(this.projectId, this.xmlFormId, this.draft)
         }).catch(noop);
       }
     },
-    setSnapshotFilter() {
-      this.snapshotFilter = '';
-      if (this.deleted) {
-        // This is not foolproof. Missing clause: __system/deletedAt became null after `now`.
-        // We don't keep restore date, that would have helped here.
-        this.snapshotFilter += `__system/deletedAt le ${this.now}`;
-      } else {
-        this.snapshotFilter += `__system/submissionDate le ${this.now} and `;
-        this.snapshotFilter += `(__system/deletedAt eq null or __system/deletedAt gt ${this.now})`;
-      }
+    refresh() {
+      this.refreshing = true;
+      this.$refs.view.refresh()
+        .then(() => { this.refreshing = false; });
+
+      // emit event to parent component to re-fetch deleted Submissions count
+      if (!this.deleted && !this.draft) this.$emit('fetch-deleted-count');
+
+      // emit event to parent component to re-fetch keys if needed
+      if (this.formVersion.keyId != null && this.keys.length === 0)
+        this.$emit('fetch-keys');
     },
     // This method accounts for the unlikely case that the user clicked the
     // refresh button before reviewing the submission. In that case, the
@@ -426,7 +369,7 @@ export default {
         submission.__id === originalSubmission.__id);
       if (index !== -1) {
         this.odata.value[index].__system.reviewState = reviewState;
-        this.$refs.table.afterReview(index);
+        this.$refs.view.afterReview(index);
       }
     },
     showDelete(submission) {
@@ -463,7 +406,7 @@ export default {
           /* Before doing a couple more things, we first determine whether
           this.odata.value still includes the Submission and if so, what the
           current index of the Submission is. If a request to refresh
-          this.odata was sent while the deletion request was in
+          this.odata (or the GeoJSON) was sent while the deletion request was in
           progress, then there could be a race condition such that data doesn't
           exist for this.odata, or this.odata.value no longer
           includes the Submission. Another possible result of the race condition is
@@ -473,7 +416,7 @@ export default {
             ? this.odata.value.findIndex(submission => submission.__id === instanceId)
             : -1;
           if (index !== -1) {
-            this.$refs.table.afterDelete(index);
+            this.$refs.view.afterDelete(index);
             this.odata.value.splice(index, 1);
           }
         })
@@ -507,7 +450,7 @@ export default {
             ? this.odata.value.findIndex(submission => submission.__id === instanceId)
             : -1;
           if (index !== -1) {
-            this.$refs.table.afterDelete(index);
+            this.$refs.view.afterDelete(index);
             this.odata.value.splice(index, 1);
           }
         })
@@ -516,12 +459,6 @@ export default {
           this.awaitingResponses.delete(instanceId);
         });
     },
-    handlePageChange() {
-      // This function is called for size change as well. So the total number of submissions are
-      // less than the lowest size option, hence we don't need to make a request.
-      if (this.odata.count < this.pageSizeOptions[0]) return;
-      this.fetchChunk(false);
-    },
     showDownloadModal(filtered = false) {
       this.downloadModal.odataFilter = filtered ? this.odataFilter : null;
       this.downloadModal.show();
@@ -569,13 +506,7 @@ export default {
   ~ #submission-download-button { margin-left: 0; }
 }
 
-#submission-list-refresh-button.move-right {
-  margin-left: auto;
-}
-
-#submission-list table:has(tbody:empty) {
-  display: none;
-}
+#submission-list .radio-field { margin-left: auto; }
 
 #submission-table:has(tbody tr) + .empty-table-message {
   display: none;
@@ -594,6 +525,7 @@ export default {
     "allDeletedOnPage": "All Submissions on the page have been deleted.",
     "downloadDisabled": "Download is unavailable for deleted Submissions",
     "filterDisabledMessage": "Filtering is unavailable for deleted Submissions",
+    "noMapEncryption": "Map is unavailable due to Form encryption",
     "deletedSubmission": {
       "emptyTable": "There are no deleted Submissions.",
       "allRestored": "All deleted Submissions are restored.",
diff --git a/src/components/submission/map-view.vue b/src/components/submission/map-view.vue
new file mode 100644
index 000000000..2c4ac4019
--- /dev/null
+++ b/src/components/submission/map-view.vue
@@ -0,0 +1,92 @@
+<!--
+Copyright 2025 ODK Central Developers
+See the NOTICE file at the top-level directory of this distribution and at
+https://github.com/getodk/central-frontend/blob/master/NOTICE.
+
+This file is part of ODK Central. It is subject to the license terms in
+the LICENSE file found in the top-level directory of this distribution and at
+https://www.apache.org/licenses/LICENSE-2.0. No part of ODK Central,
+including this file, may be copied, modified, propagated, or distributed
+except according to the terms contained in the LICENSE file.
+-->
+<template>
+  <geojson-map v-if="geojson.dataExists && geojson.features.length !== 0"
+    :features="geojson.features"/>
+  <odata-loading-message type="submission" :odata="geojson"
+    :filter="filter != null" :refreshing="refreshing" :total-count="0"
+    :top="0"/>
+</template>
+
+<script setup>
+import { watch } from 'vue';
+
+import GeojsonMap from '../geojson-map.vue';
+import OdataLoadingMessage from '../odata-loading-message.vue';
+
+import { apiPaths } from '../../util/request';
+import { noargs, noop } from '../../util/util';
+import { useRequestData } from '../../request-data';
+
+defineOptions({
+  name: 'SubmissionMapView'
+});
+const props = defineProps({
+  // Props passed from FormSubmissions via SubmissionList
+  projectId: {
+    type: String,
+    required: true
+  },
+  xmlFormId: {
+    type: String,
+    required: true
+  },
+  deleted: Boolean,
+
+  // Table actions
+  filter: Object,
+
+  // Loading message
+  refreshing: Boolean
+});
+
+const { odata, createResource } = useRequestData();
+const geojson = createResource('geojson', () => ({
+  transformResponse: ({ data, config }) => {
+    // After the GeoJSON response is received, we also set `odata`, as if we
+    // received an OData response. That's needed because `odata` drives much of
+    // the logic in SubmissionList. For a long time, SubmissionList was only a
+    // table and only cared about OData. When we set `odata`, we set as little
+    // data as possible in order to minimize the memory footprint.
+    const { features } = data;
+    odata.setFromResponse({
+      data: {
+        value: features.map(({ id }) => ({ __id: id })),
+        '@odata.count': features.length
+      },
+      config
+    });
+
+    // After setting `odata`, return the GeoJSON unchanged.
+    return data;
+  }
+}));
+
+const fetchData = (clear = true) => {
+  const query = !props.deleted
+    ? props.filter
+    : { ...props.filter, deleted: true };
+  const url = apiPaths.submissions(
+    props.projectId,
+    props.xmlFormId,
+    false,
+    '.geojson',
+    query
+  );
+  return geojson.request({ url, clear }).catch(noop);
+};
+fetchData();
+watch([() => props.filter, () => props.deleted], noargs(fetchData));
+const refresh = () => fetchData(false);
+
+defineExpose({ refresh });
+</script>
diff --git a/src/components/submission/table-view.vue b/src/components/submission/table-view.vue
new file mode 100644
index 000000000..69239dbb2
--- /dev/null
+++ b/src/components/submission/table-view.vue
@@ -0,0 +1,173 @@
+<!--
+Copyright 2025 ODK Central Developers
+See the NOTICE file at the top-level directory of this distribution and at
+https://github.com/getodk/central-frontend/blob/master/NOTICE.
+
+This file is part of ODK Central. It is subject to the license terms in
+the LICENSE file found in the top-level directory of this distribution and at
+https://www.apache.org/licenses/LICENSE-2.0. No part of ODK Central,
+including this file, may be copied, modified, propagated, or distributed
+except according to the terms contained in the LICENSE file.
+-->
+<template>
+  <submission-table v-show="odata.dataExists" ref="table"
+    :project-id="projectId" :xml-form-id="xmlFormId" :draft="draft" :deleted="deleted"
+    :fields="fields" :awaiting-deleted-responses="awaitingResponses"
+    @review="$emit('review', $event)"
+    @delete="$emit('delete', $event)"
+    @restore="$emit('restore', $event)"/>
+  <odata-loading-message type="submission"
+    :top="pagination.size"
+    :odata="odata"
+    :filter="!!filter"
+    :refreshing="refreshing"
+    :total-count="totalCount"/>
+  <!-- @update:page is emitted on size change as well -->
+  <Pagination v-if="pagination.count > 0"
+    v-model:page="pagination.page" v-model:size="pagination.size"
+    :count="pagination.count" :size-options="pageSizeOptions"
+    :spinner="odata.awaitingResponse"
+    @update:page="handlePageChange"/>
+</template>
+
+<script setup>
+import { computed, reactive, useTemplateRef, watch } from 'vue';
+
+import OdataLoadingMessage from '../odata-loading-message.vue';
+import Pagination from '../pagination.vue';
+import SubmissionTable from './table.vue';
+
+import { apiPaths } from '../../util/request';
+import { noop } from '../../util/util';
+import { useRequestData } from '../../request-data';
+
+defineOptions({
+  name: 'SubmissionTableView'
+});
+const props = defineProps({
+  // Props passed from FormSubmissions via SubmissionList
+  projectId: {
+    type: String,
+    required: true
+  },
+  xmlFormId: {
+    type: String,
+    required: true
+  },
+  draft: Boolean,
+  deleted: Boolean,
+
+  // Table actions
+  filter: String,
+  fields: Array,
+
+  // Loading message
+  totalCount: {
+    type: Number,
+    default: 0
+  },
+  refreshing: Boolean,
+
+  awaitingResponses: {
+    type: Set,
+    required: true
+  }
+});
+defineEmits(['review', 'delete', 'restore']);
+
+const { odata, deletedSubmissionCount } = useRequestData();
+
+const pageSizeOptions = [250, 500, 1000];
+const pagination = reactive({ page: 0, size: pageSizeOptions[0], count: 0 });
+
+let snapshotFilter;
+const setSnapshotFilter = () => {
+  snapshotFilter = '';
+  const now = new Date().toISOString();
+  if (props.deleted) {
+    // This is not foolproof. Missing clause: __system/deletedAt became null after `now`.
+    // We don't keep restore date, that would have helped here.
+    snapshotFilter += `__system/deletedAt le ${now}`;
+  } else {
+    snapshotFilter += `__system/submissionDate le ${now} and `;
+    // We include __system/deletedAt gt ${now} so that if the user deletes a
+    // submission, then changes the page, other submissions stay on the same
+    // page as before.
+    snapshotFilter += `(__system/deletedAt eq null or __system/deletedAt gt ${now})`;
+  }
+};
+
+const odataSelect = computed(() => {
+  if (props.fields == null) return null;
+  const paths = props.fields.map(({ path }) => path.replace('/', ''));
+  paths.unshift('__id', '__system');
+  return paths.join(',');
+});
+
+// `clear` indicates whether this.odata should be cleared before sending the
+// request. `refresh` indicates whether the request is a background refresh.
+const fetchChunk = (clear, refresh = false) => {
+  // Are we fetching the first chunk of submissions or the next chunk?
+  const first = clear || refresh;
+  if (first) {
+    setSnapshotFilter();
+    pagination.page = 0;
+  }
+
+  let $filter = snapshotFilter;
+  if (props.filter) {
+    $filter += ` and ${props.filter}`;
+  }
+
+  return odata.request({
+    url: apiPaths.odataSubmissions(
+      props.projectId,
+      props.xmlFormId,
+      props.draft,
+      {
+        $top: pagination.size,
+        $skip: pagination.page * pagination.size,
+        $count: true,
+        $wkt: true,
+        $filter,
+        $select: odataSelect.value,
+        $orderby: '__system/submissionDate desc'
+      }
+    ),
+    clear,
+    patch: !first
+      ? (response) => odata.replaceData(response.data, response.config)
+      : null
+  })
+    .then(() => {
+      pagination.count = odata.count;
+
+      if (props.deleted) {
+        deletedSubmissionCount.cancelRequest();
+        if (!deletedSubmissionCount.dataExists) {
+          deletedSubmissionCount.data = reactive({});
+        }
+        deletedSubmissionCount.value = odata.count;
+      }
+    })
+    .catch(noop);
+};
+fetchChunk(true);
+watch([() => props.filter, () => props.deleted], () => { fetchChunk(true); });
+watch(() => props.fields, (_, oldFields) => {
+  if (oldFields != null) fetchChunk(true);
+});
+const handlePageChange = () => {
+  // This function is called for size change as well. So the total number of submissions are
+  // less than the lowest size option, hence we don't need to make a request.
+  if (odata.count < pageSizeOptions[0]) return;
+  fetchChunk(false);
+};
+const refresh = () => fetchChunk(false, true);
+
+const table = useTemplateRef('table');
+const afterReview = (index) => table.value.afterReview(index);
+const afterDelete = (index) => table.value.afterDelete(index);
+
+defineExpose({ refresh, afterReview, afterDelete });
+</script>
diff --git a/src/components/submission/table.vue b/src/components/submission/table.vue
index 579e11a00..eb261e3ec 100644
--- a/src/components/submission/table.vue
+++ b/src/components/submission/table.vue
@@ -98,6 +98,8 @@ defineExpose({ afterReview, afterDelete });
 @import '../../assets/scss/mixins';
 
 #submission-table {
+  table:has(tbody:empty) { display: none; }
+
   .table-freeze-scrolling {
     th, td {
       @include text-overflow-ellipsis;
diff --git a/src/composables/date-range-query-ref.js b/src/composables/date-range-query-ref.js
new file mode 100644
index 000000000..7fcf4bc4a
--- /dev/null
+++ b/src/composables/date-range-query-ref.js
@@ -0,0 +1,29 @@
+/*
+Copyright 2025 ODK Central Developers
+See the NOTICE file at the top-level directory of this distribution and at
+https://github.com/getodk/central-frontend/blob/master/NOTICE.
+
+This file is part of ODK Central. It is subject to the license terms in
+the LICENSE file found in the top-level directory of this distribution and at
+https://www.apache.org/licenses/LICENSE-2.0. No part of ODK Central,
+including this file, may be copied, modified, propagated, or distributed
+except according to the terms contained in the LICENSE file.
+*/
+
+import { DateTime } from 'luxon';
+import useQueryRef from './query-ref';
+
+export default () => useQueryRef({
+  fromQuery: (query) => {
+    if (typeof query.start === 'string' && typeof query.end === 'string') {
+      const start = DateTime.fromISO(query.start);
+      const end = DateTime.fromISO(query.end);
+      if (start.isValid && end.isValid && start <= end)
+        return [start.startOf('day'), end.startOf('day')];
+    }
+    return [];
+  },
+  toQuery: (value) => (value.length !== 0
+    ? { start: value[0].toISODate(), end: value[1].toISODate() }
+    : { start: null, end: null })
+});
diff --git a/src/locales/en.json5 b/src/locales/en.json5
index 3fac91ab4..4ed0f259d 100644
--- a/src/locales/en.json5
+++ b/src/locales/en.json5
@@ -227,7 +227,8 @@
     "expand": "Expand",
     "collapse": "Collapse",
     // @transifexKey component.FormTrashRow.action.restore
-    "restore": "Restore"
+    "restore": "Restore",
+    "selectRow": "Select row"
   },
   "field": {
     "comment": "Leave a comment…",
@@ -416,6 +417,7 @@
     "forum": "Forum",
     "lastUpdate": "Last update",
     "loading": "Loading…",
+    "map": "Map",
     "no": "No",
     // This is shown if a search returned no results.
     "noResults": "No results",
@@ -434,6 +436,7 @@
     "tab": {
       "settings": "Settings"
     },
+    "table": "Table",
     "total": "Total",
     "totalSubmissions": "Total Submissions",
     // {inform} is the number of Entity Properties defined by the form.
diff --git a/src/request-data/entities.js b/src/request-data/entities.js
index 4ce0ae184..461cc8fbe 100644
--- a/src/request-data/entities.js
+++ b/src/request-data/entities.js
@@ -12,6 +12,7 @@ except according to the terms contained in the LICENSE file.
 import { shallowReactive, reactive } from 'vue';
 
 import { useRequestData } from './index';
+import { computeIfExists } from './util';
 
 const transformValue = (data, config) => {
   const { searchParams } = new URL(config.url, window.location.origin);
@@ -22,7 +23,8 @@ const transformValue = (data, config) => {
     ...entity,
     __system: {
       ...entity.__system,
-      rowNumber: count - skip - index
+      rowNumber: count - skip - index,
+      selected: false
     }
   }));
 };
@@ -48,5 +50,9 @@ export default () => {
       value: data['@odata.count']
     })
   }));
-  return { odataEntities: entityOData, deletedEntityCount };
+  const entityCreators = createResource('entityCreators', () => ({
+    ids: computeIfExists(() =>
+      entityCreators.reduce((set, { id }) => set.add(id), new Set()))
+  }));
+  return { odataEntities: entityOData, deletedEntityCount, entityCreators };
 };
diff --git a/src/request-data/fields.js b/src/request-data/fields.js
index b02f43915..d362387a2 100644
--- a/src/request-data/fields.js
+++ b/src/request-data/fields.js
@@ -27,8 +27,8 @@ export default () => {
       return data;
     },
     /* eslint-enable no-param-reassign */
-    selectable: computeIfExists(() => {
-      const selectable = [];
+    outsideRepeat: computeIfExists(() => {
+      const result = [];
       // The path of the top-level repeat group currently being traversed
       let repeat = null;
       for (const field of fields) {
@@ -39,19 +39,21 @@ export default () => {
           // in the Widgets sample form (<branch>):
           // https://github.com/getodk/sample-forms/blob/e9fe5838e106b04bf69f43a8a791327093571443/Widgets.xml
           const { type } = field;
-          if (type === 'repeat') {
+          if (type === 'repeat')
             repeat = `${path}/`;
-          } else if (type !== 'structure' && path !== '/meta/instanceID' &&
-            path !== '/instanceID') {
-            selectable.push(field);
-          }
+          else if (type !== 'structure')
+            result.push(field);
         }
       }
-      return selectable;
+      return result;
     }),
+    selectable: computeIfExists(() => fields.outsideRepeat.filter(({ path }) =>
+      path !== '/meta/instanceID' && path !== '/instanceID')),
     binaryPaths: computeIfExists(() => fields.reduce(
       (acc, cur) => (cur.binary ? acc.add(cur.path) : acc),
       new Set()
-    ))
+    )),
+    hasMappable: computeIfExists(() => fields.outsideRepeat.some(({ type }) =>
+      type === 'geopoint' || type === 'geotrace' || type === 'geoshape'))
   }));
 };
diff --git a/src/request-data/resource.js b/src/request-data/resource.js
index bb2f69059..a5a5be249 100644
--- a/src/request-data/resource.js
+++ b/src/request-data/resource.js
@@ -45,6 +45,12 @@ class BaseResource {
   }
 
   get awaitingResponse() { return this[_store].awaitingResponse; }
+  // `Date` object for when the `data` property was last set (including setting
+  // it to `null`)
+  get setAt() { return this[_store].setAt; }
+  // `Date` object for when the `data` property was last patched. See the
+  // `patch` option of the request() method below.
+  get patchedAt() { return this[_store].patchedAt; }
 
   get dataExists() { return this[_store].data != null; }
   get initiallyLoading() { return this.awaitingResponse && !this.dataExists; }
@@ -62,14 +68,24 @@ const _container = Symbol('container');
 const _abortController = Symbol('abortController');
 class Resource extends BaseResource {
   constructor(container, name) {
-    const store = shallowReactive({ data: null, awaitingResponse: false });
+    const store = shallowReactive({
+      data: null,
+      awaitingResponse: false,
+      setAt: null,
+      patchedAt: null
+    });
     super(name, store);
     this[_container] = container;
     this[_abortController] = null;
   }
 
   get data() { return this[_store].data; }
-  set data(value) { this[_store].data = value; }
+
+  set data(value) {
+    this[_store].data = value;
+    this[_store].setAt = new Date();
+  }
+
   toRefs() { return { ...super.toRefs(), data: toRef(this[_store], 'data') }; }
 
   cancelRequest() { if (this.awaitingResponse) this[_abortController].abort(); }
@@ -277,6 +293,7 @@ class Resource extends BaseResource {
         } else {
           if (!this.dataExists) throw new Error('data does not exist');
           patch(response, this);
+          this[_store].patchedAt = new Date();
         }
       });
   }
diff --git a/src/util/request.js b/src/util/request.js
index 549b928f3..44cc2fbe2 100644
--- a/src/util/request.js
+++ b/src/util/request.js
@@ -25,8 +25,14 @@ export const queryString = (query) => {
   const entries = Object.entries(query);
   if (entries.length === 0) return '';
   const params = new URLSearchParams();
-  for (const [name, value] of entries)
-    if (value != null) params.set(name, value.toString());
+  for (const [name, value] of entries) {
+    if (Array.isArray(value)) {
+      for (const element of value)
+        params.append(name, element === null ? 'null' : element.toString());
+    } else if (value != null) {
+      params.set(name, value.toString());
+    }
+  }
   const qs = params.toString();
   return qs !== '' ? `?${qs}` : qs;
 };
@@ -168,10 +174,11 @@ export const apiPaths = {
   datasets: projectPath('/datasets'),
   dataset: datasetPath(''),
   datasetProperties: datasetPath('/properties'),
-  entities: (projectId, datasetName, extension = '', query = undefined) => {
+  entityCreators: datasetPath('/entities/creators'),
+  entities: (projectId, datasetName, suffix = '', query = undefined) => {
     const encodedName = encodeURIComponent(datasetName);
     const qs = queryString(query);
-    return `/v1/projects/${projectId}/datasets/${encodedName}/entities${extension}${qs}`;
+    return `/v1/projects/${projectId}/datasets/${encodedName}/entities${suffix}${qs}`;
   },
   odataEntitiesSvc: datasetPath('.svc'),
   odataEntities: datasetPath('.svc/Entities'),
diff --git a/test/components/enketo-iframe.spec.js b/test/components/enketo-iframe.spec.js
index e97c03480..53b871775 100644
--- a/test/components/enketo-iframe.spec.js
+++ b/test/components/enketo-iframe.spec.js
@@ -3,6 +3,9 @@ import EnketoIframe from '../../src/components/enketo-iframe.vue';
 import { mergeMountOptions, mount } from '../util/lifecycle';
 import { mockRouter } from '../util/router';
 import { wait } from '../util/util';
+import testData from '../data';
+import { load } from '../util/http';
+import { mockLogin } from '../util/session';
 
 const enketoId = 'sCTIfjC5LrUto4yVXRYJkNKzP7e53vo';
 
@@ -24,6 +27,13 @@ const postMessageToParent = async (iframe, data) => {
   await wait();
 };
 
+const submit = async (component) => {
+  const form = component.get('#account-login form');
+  await form.get('input[type="email"]').setValue('test@email.com');
+  await form.get('input[type="password"]').setValue('foo');
+  return form.trigger('submit');
+};
+
 describe('EnketoIframe', () => {
   [
     { actionType: 'new', expected: `/enketo-passthrough/${enketoId}` },
@@ -40,6 +50,28 @@ describe('EnketoIframe', () => {
     });
   });
 
+  it('renders iframe with /single prefix when single=true query parameter for new submission', async () => {
+    mockLogin();
+    testData.extendedForms.createPast(1, { xmlFormId: 'a' });
+    const app = await load('/projects/1/forms/a/submissions/new?single=true')
+      .complete();
+
+    const iframe = app.find('iframe');
+    iframe.attributes('src').should.contain('/enketo-passthrough/single/');
+  });
+
+  it('renders iframe without /single prefix when single=false for public-link', async () => {
+    testData.extendedForms.createPast(1, { xmlFormId: 'a' });
+
+    const app = await load(`/f/${enketoId}?single=false&st=token`)
+      .restoreSession(false) // it's public link so not need to restore sessioin
+      .complete();
+
+    const iframe = app.find('iframe');
+    iframe.attributes('src').should.contain(`/enketo-passthrough/${enketoId}`);
+    iframe.attributes('src').should.not.contain('/single/');
+  });
+
   it('redirects on submissionsuccess message with return_url - internal', async () => {
     const wrapper = mountComponent({
       props: { enketoId, actionType: 'public-link' },
@@ -77,6 +109,29 @@ describe('EnketoIframe', () => {
     fakeAssign.calledWith(new URL('http://example.com/projects/1')).should.be.true;
   });
 
+  it('redirect on submissionsuccess for new submission when single=true', async () => {
+    const fakeAssign = sinon.fake();
+    const wrapper = mountComponent({
+      props: { enketoId, actionType: 'new' },
+      container: {
+        router: mockRouter('/?return_url=http://example.com/projects/1&single=true'),
+        location: {
+          origin: window.location.origin,
+          assign: (url) => {
+            fakeAssign(url);
+          }
+        }
+      }
+    });
+    const iframe = wrapper.find('iframe');
+
+    const data = JSON.stringify({ enketoEvent: 'submissionsuccess' });
+    await postMessageToParent(iframe, data);
+
+    fakeAssign.called.should.be.true;
+    fakeAssign.args[0][0].href.should.equal('http://example.com/projects/1');
+  });
+
   it('does not redirect on invalid return URL', async () => {
     const fakeAssign = sinon.fake();
     const wrapper = mountComponent({
@@ -100,6 +155,51 @@ describe('EnketoIframe', () => {
     wrapper.vm.$router.push.called.should.be.false;
   });
 
+  it('does not redirect on submissionsuccess for public-link when single=false', async () => {
+    const fakeAssign = sinon.fake();
+    const wrapper = mountComponent({
+      props: { enketoId, actionType: 'public-link' },
+      container: {
+        router: mockRouter('/?return_url=http://example.com/projects/1&single=false'),
+        location: {
+          origin: window.location.origin,
+          assign: (url) => {
+            fakeAssign(url);
+          }
+        }
+      }
+    });
+    const iframe = wrapper.find('iframe');
+
+    const data = JSON.stringify({ enketoEvent: 'submissionsuccess' });
+    await postMessageToParent(iframe, data);
+
+    fakeAssign.called.should.be.false;
+  });
+
+  // 'single' query parameter is false implicitly
+  it('does not redirects on submissionsuccess for new submission', async () => {
+    const fakeAssign = sinon.fake();
+    const wrapper = mountComponent({
+      props: { enketoId, actionType: 'new' },
+      container: {
+        router: mockRouter('/?return_url=http://example.com/projects/1'),
+        location: {
+          origin: window.location.origin,
+          assign: (url) => {
+            fakeAssign(url);
+          }
+        }
+      }
+    });
+    const iframe = wrapper.find('iframe');
+
+    const data = JSON.stringify({ enketoEvent: 'submissionsuccess' });
+    await postMessageToParent(iframe, data);
+
+    fakeAssign.called.should.be.false;
+  });
+
   it('bubbles up the message event', async () => {
     const wrapper = mountComponent({
       props: { enketoId, actionType: 'new', instanceId: 'test-instance' },
@@ -155,7 +255,7 @@ describe('EnketoIframe', () => {
     src.should.contain('hello%20world');
   });
 
-  it('passes + sign as it is', () => {
+  it('passes + sign as %20', () => {
     const wrapper = mountComponent({
       props: { enketoId, actionType: 'new' },
       container: {
@@ -165,7 +265,25 @@ describe('EnketoIframe', () => {
     const iframe = wrapper.find('iframe');
     const src = iframe.attributes('src');
 
-    src.should.contain('hello%20+%20world');
+    src.should.contain('hello%20%20%20world');
+  });
+
+  it('should pass %20 to the iframe after login redirect', () => {
+    testData.extendedForms.createPast(1);
+    testData.extendedUsers.createPast(1, { email: 'test@email.com', role: 'none' });
+    return load('/login?next=%2Fprojects%2F1%2Fforms%2Ff%2Fsubmissions%2Fnew%3Fd%5Bfirstname%5D%3Djohn%2520doe')
+      .restoreSession(false)
+      .complete()
+      .request(submit)
+      .respondWithData(() => testData.sessions.createNew())
+      .respondWithData(() => testData.extendedUsers.last())
+      .respondWithData(() => testData.extendedProjects.first())
+      .respondWithData(() => testData.extendedForms.last())
+      .afterResponses(app => {
+        const iframe = app.find('iframe');
+        const src = iframe.attributes('src');
+        src.should.contain('john%20doe');
+      });
   });
 });
 
diff --git a/test/components/entity/download-button.spec.js b/test/components/entity/download-button.spec.js
index 4f08bcae2..b869164f8 100644
--- a/test/components/entity/download-button.spec.js
+++ b/test/components/entity/download-button.spec.js
@@ -23,7 +23,7 @@ describe('EntityDownloadButton', () => {
     });
 
     describe('entities are filtered', () => {
-      it('show the dropdown menu', () => {
+      it('show the dropdown menu when odataFilter is set', () => {
         testData.extendedDatasets.createPast(1);
         const component = mountComponent({
           props: { odataFilter: '__system/conflict ne null' }
@@ -31,12 +31,28 @@ describe('EntityDownloadButton', () => {
         component.find('.btn-primary').attributes()['data-toggle'].should.be.eql('dropdown');
       });
 
+      it('show the dropdown menu when searchTerm is set', () => {
+        testData.extendedDatasets.createPast(1);
+        const component = mountComponent({
+          props: { searchTerm: 'lorem ipsum' }
+        });
+        component.find('.btn-primary').attributes()['data-toggle'].should.be.eql('dropdown');
+      });
+
+      it('show the dropdown menu when both odataFilter and searchTerm are set', () => {
+        testData.extendedDatasets.createPast(1);
+        const component = mountComponent({
+          props: { odataFilter: '__system/conflict ne null', searchTerm: 'lorem ipsum' }
+        });
+        component.find('.btn-primary').attributes()['data-toggle'].should.be.eql('dropdown');
+      });
+
       it('shows correct text while first chunk of entities is loading for the first button', () => {
         testData.extendedDatasets.createPast(1);
         const component = mountComponent({
           props: { odataFilter: '__system/conflict ne null' }
         });
-        component.find('li:nth-of-type(1)').text().should.equal('Download all Entities matching the filter');
+        component.find('li:nth-of-type(1)').text().should.equal('Download all matching Entities');
       });
 
       it('shows correct text after first chunk of entities has loaded for the first button', () => {
@@ -49,7 +65,7 @@ describe('EntityDownloadButton', () => {
             }
           }
         });
-        component.find('li:nth-of-type(1)').text().should.equal('Download 1,000 Entities matching the filter');
+        component.find('li:nth-of-type(1)').text().should.equal('Download 1,000 matching Entities');
       });
 
       it('shows correct text for the second button', () => {
@@ -72,8 +88,7 @@ describe('EntityDownloadButton', () => {
     });
 
     describe('entities are filtered', () => {
-      // I am here, add href test for two menu items
-      it('sets the correct attribute for downloading filtered entities', () => {
+      it('sets the correct attribute for downloading filtered entities with odataFilter', () => {
         testData.extendedDatasets.createPast(1, { name: 'á' });
         const component = mountComponent({
           props: { odataFilter: '__system/conflict ne null' }
@@ -84,6 +99,29 @@ describe('EntityDownloadButton', () => {
         url.searchParams.get('$filter').should.equal('__system/conflict ne null');
       });
 
+      it('sets the correct attribute for downloading filtered entities with searchTerm', () => {
+        testData.extendedDatasets.createPast(1, { name: 'á' });
+        const component = mountComponent({
+          props: { searchTerm: 'lorem ipsum' }
+        });
+        const { href } = component.find('li:nth-of-type(1) a').attributes();
+        const url = relativeUrl(href);
+        url.pathname.should.equal('/v1/projects/1/datasets/%C3%A1/entities.csv');
+        url.searchParams.get('$search').should.equal('lorem ipsum');
+      });
+
+      it('sets the correct attribute for downloading filtered entities with both odataFilter and searchTerm', () => {
+        testData.extendedDatasets.createPast(1, { name: 'á' });
+        const component = mountComponent({
+          props: { odataFilter: '__system/conflict ne null', searchTerm: 'lorem ipsum' }
+        });
+        const { href } = component.find('li:nth-of-type(1) a').attributes();
+        const url = relativeUrl(href);
+        url.pathname.should.equal('/v1/projects/1/datasets/%C3%A1/entities.csv');
+        url.searchParams.get('$filter').should.equal('__system/conflict ne null');
+        url.searchParams.get('$search').should.equal('lorem ipsum');
+      });
+
       it('sets the correct attribute for downloading all entities', () => {
         testData.extendedDatasets.createPast(1, { name: 'á' });
         const component = mountComponent({
diff --git a/test/components/entity/filters.spec.js b/test/components/entity/filters.spec.js
index 102566705..53a0d77ba 100644
--- a/test/components/entity/filters.spec.js
+++ b/test/components/entity/filters.spec.js
@@ -1,15 +1,27 @@
+import { DateTime, Settings } from 'luxon';
 import EntityFiltersConflict from '../../../src/components/entity/filters/conflict.vue';
 import EntityMetadataRow from '../../../src/components/entity/metadata-row.vue';
+import DateRangePicker from '../../../src/components/date-range-picker.vue';
 
 import testData from '../../data';
 import { changeMultiselect } from '../../util/trigger';
 import { load } from '../../util/http';
 import { mockLogin } from '../../util/session';
 import { relativeUrl } from '../../util/request';
+import { setLuxon } from '../../util/date-time';
+
+const createFieldKeys = (count) => new Array(count).fill(undefined)
+  .map((_, i) => testData.extendedFieldKeys
+    .createPast(1, { displayName: `App User ${i}` })
+    .last());
 
 describe('EntityFilters', () => {
   beforeEach(mockLogin);
 
+  beforeEach(() => {
+    setLuxon({ defaultZoneName: 'UTC' });
+  });
+
   describe('conflict filter', () => {
     beforeEach(() => {
       testData.extendedDatasets.createPast(1);
@@ -39,6 +51,16 @@ describe('EntityFilters', () => {
             const filter = relativeUrl(url).searchParams.get('$filter');
             filter.should.match(/__system\/conflict eq null/);
           }));
+
+      it('filters on submitter if ?submitter is specified', () =>
+        load('/projects/1/entity-lists/trees/entities?creatorId=1&creatorId=2')
+          .beforeEachResponse((_, { url }, index) => {
+            if (index !== 1) return;
+            if (url.includes('.svc')) {
+              const filter = relativeUrl(url).searchParams.get('$filter');
+              filter.should.match(/__system\/creatorId eq 1 or __system\/creatorId eq 2/);
+            }
+          }));
     });
 
     describe('initial filter selection', () => {
@@ -162,6 +184,143 @@ describe('EntityFilters', () => {
     });
   });
 
+  describe('creator filter', () => {
+    beforeEach(() => {
+      testData.extendedProjects.createPast(1, { forms: 1, appUsers: 3 });
+      testData.extendedDatasets.createPast(1, { entities: 3 });
+      const fieldKeys = createFieldKeys(3);
+      testData.extendedEntities
+        .createPast(1, { creator: fieldKeys[2] })
+        .createPast(1, { creator: fieldKeys[1] })
+        .createPast(1, { creator: fieldKeys[0] });
+    });
+
+    it('sends a request', () =>
+      load('/projects/1/entity-lists/trees/entities', {
+        attachTo: document.body
+      })
+        .complete()
+        .request(changeMultiselect('#entity-filters-creator', [0]))
+        .beforeEachResponse((_, { url }) => {
+          const filter = relativeUrl(url).searchParams.get('$filter');
+          const { id } = testData.extendedFieldKeys.first();
+          filter.should.include(`(__system/creatorId eq ${id})`);
+        })
+        .respondWithData(() => ({
+          ...testData.entityOData(1),
+          '@odata.count': 1
+        })));
+
+    it('updates the URL', () =>
+      load('/projects/1/entity-lists/trees/entities', {
+        attachTo: document.body
+      })
+        .complete()
+        .request(changeMultiselect('#entity-filters-creator', [0]))
+        .respondWithData(() => ({
+          ...testData.entityOData(1),
+          '@odata.count': 1
+        }))
+        .afterResponse(component => {
+          const { creatorId } = component.vm.$route.query;
+          const { id } = testData.extendedFieldKeys.first();
+          creatorId.should.eql([id.toString()]);
+        }));
+
+    it('re-renders the table', () => {
+      testData.extendedEntities.createPast(250);
+      load('/projects/1/entity-lists/trees/entities', {
+        attachTo: document.body
+      })
+        .complete()
+        .request(component => {
+          component.get('button[aria-label="Next page"]').trigger('click');
+        })
+        .respondWithData(() => testData.entityOData(250, 250))
+        .afterResponse(component => {
+          component.findAllComponents(EntityMetadataRow).length.should.equal(3);
+        })
+        .request(changeMultiselect('#entity-filters-creator', [0]))
+        .beforeEachResponse((component, { url }) => {
+          component.findComponent(EntityMetadataRow).exists().should.be.false;
+          relativeUrl(url).searchParams.get('$skip').should.be.eql('0');
+        })
+        .respondWithData(() => ({
+          ...testData.entityOData(1),
+          '@odata.count': 1
+        }))
+        .afterResponse(component => {
+          component.findAllComponents(EntityMetadataRow).length.should.equal(1);
+        });
+    });
+
+    it('allows multiple creators to be selected', () =>
+      load('/projects/1/entity-lists/trees/entities', {
+        attachTo: document.body
+      })
+        .complete()
+        .request(changeMultiselect('#entity-filters-creator', [0, 1]))
+        .beforeEachResponse((_, { url }) => {
+          const filter = relativeUrl(url).searchParams.get('$filter');
+          const id0 = testData.extendedFieldKeys.get(0).id;
+          const id1 = testData.extendedFieldKeys.get(1).id;
+          filter.should.include(`(__system/creatorId eq ${id0} or __system/creatorId eq ${id1})`);
+        })
+        .respondWithData(() => ({
+          ...testData.entityOData(2),
+          '@odata.count': 2
+        })));
+  });
+
+  describe('createdAt filter', () => {
+    beforeEach(() => {
+      testData.extendedDatasets.createPast(1);
+    });
+
+    it('sends a request', () =>
+      load('/projects/1/entity-lists/trees/entities', {
+        attachTo: document.body
+      })
+        .complete()
+        .request(component => {
+          component.getComponent(DateRangePicker).vm.close([
+            DateTime.fromISO('1970-01-01').toJSDate(),
+            DateTime.fromISO('1970-01-02').toJSDate()
+          ]);
+        })
+        .beforeEachResponse((_, { url }) => {
+          const filters = new URL(url, window.location.origin).searchParams.get('$filter').split(' and ');
+
+          const start = filters[2].split(' ge ')[1];
+          start.should.equal('1970-01-01T00:00:00.000Z');
+
+          DateTime.fromISO(start).zoneName.should.equal(Settings.defaultZoneName);
+
+          const end = filters[3].split(' le ')[1];
+          end.should.equal('1970-01-02T23:59:59.999Z');
+          DateTime.fromISO(end).zoneName.should.equal(Settings.defaultZoneName);
+        })
+        .respondWithData(testData.entityOData));
+
+    it('updates the URL', () =>
+      load('/projects/1/entity-lists/trees/entities', {
+        attachTo: document.body
+      })
+        .complete()
+        .request(component => {
+          component.getComponent(DateRangePicker).vm.close([
+            DateTime.fromISO('1970-01-01').toJSDate(),
+            DateTime.fromISO('1970-01-02').toJSDate()
+          ]);
+        })
+        .respondWithData(testData.entityOData)
+        .afterResponse(component => {
+          const { start, end } = component.vm.$route.query;
+          start.should.equal('1970-01-01');
+          end.should.equal('1970-01-02');
+        }));
+  });
+
   it('shows correct message if there are no entities after filtering', async () => {
     testData.extendedDatasets.createPast(1);
     const component = await load('/projects/1/entity-lists/trees/entities?conflict=true', {
@@ -206,6 +365,8 @@ describe('EntityFilters', () => {
       .afterResponses(component => {
         const conflictFilter = component.findAll('.multiselect select');
         conflictFilter[0].attributes('aria-disabled').should.equal('true');
+        conflictFilter[1].attributes('aria-disabled').should.equal('true');
+        component.getComponent(DateRangePicker).props().disabled.should.be.true;
       });
   });
 });
diff --git a/test/components/entity/list.spec.js b/test/components/entity/list.spec.js
index 743cae748..8c5f0617d 100644
--- a/test/components/entity/list.spec.js
+++ b/test/components/entity/list.spec.js
@@ -47,7 +47,8 @@ describe('EntityList', () => {
           searchParams.get('$filter').should.match(/__system\/createdAt le \S+ and \(__system\/deletedAt eq null or __system\/deletedAt gt \S+\)/);
           searchParams.get('$top').should.be.eql('250');
         }
-      }
+      },
+      { url: '/v1/projects/1/datasets/trees/entities/creators' },
     ]);
   });
 
@@ -1174,4 +1175,319 @@ describe('EntityList', () => {
           app.get('.search-textbox').element.value.should.be.equal('john');
         }));
   });
+
+  describe('bulk delete functionality', () => {
+    beforeEach(() => {
+      createEntities(3);
+    });
+
+    it('shows action bar when entities are selected', async () => {
+      const component = await loadEntityList();
+      const actionBar = component.findComponent({ name: 'ActionBar' });
+      actionBar.props().state.should.be.false;
+
+      const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+      await checkboxes[0].setValue(true);
+      await checkboxes[1].setValue(true);
+
+      actionBar.props().state.should.be.true;
+      actionBar.props().message.should.equal('2 Entities selected');
+    });
+
+    it('hides action bar when all entities are deselected', async () => {
+      const component = await loadEntityList();
+      const actionBar = component.findComponent({ name: 'ActionBar' });
+
+      // Click on checkboxes to select entities first
+      const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+      await checkboxes[0].setValue(true);
+      await checkboxes[1].setValue(true);
+
+      actionBar.props().state.should.be.true;
+
+      await checkboxes[0].setValue(false);
+      await checkboxes[1].setValue(false);
+
+      actionBar.props().state.should.be.false;
+    });
+
+    it('handles select all functionality', async () => {
+      const component = await loadEntityList();
+      const actionBar = component.findComponent({ name: 'ActionBar' });
+
+      actionBar.props().state.should.be.false;
+
+      // Click the header "select all" checkbox
+      const headerCheckbox = component.find('#entity-table input[type="checkbox"]');
+      const rowCheckboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+
+      await headerCheckbox.setValue(true);
+
+      actionBar.props().state.should.be.true;
+      actionBar.props().message.should.equal('3 Entities selected');
+
+      rowCheckboxes.forEach(checkbox => {
+        checkbox.element.checked.should.be.true;
+      });
+
+      // unselect all
+      await headerCheckbox.setValue(false);
+      actionBar.props().state.should.be.false;
+      rowCheckboxes.forEach(checkbox => {
+        checkbox.element.checked.should.be.false;
+      });
+    });
+
+    it('handles bulk delete request successfully', () => load('/projects/1/entity-lists/trees/entities')
+      .complete()
+      .request(async component => {
+        const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+        await checkboxes[0].setValue(true);
+        await checkboxes[1].setValue(true);
+        return component.find('.action-bar-container .btn-primary').trigger('click');
+      })
+      .beforeEachResponse((_, { url, data }) => {
+        url.should.equal('/v1/projects/1/datasets/trees/entities/bulk-delete');
+        const entities = testData.extendedEntities.sorted();
+        const expectedUUIDs = [entities[0].uuid, entities[1].uuid];
+        data.ids.should.eql(expectedUUIDs);
+      })
+      .respondWithSuccess()
+      .afterResponse(component => {
+        const actionBar = component.findComponent({ name: 'ActionBar' });
+        actionBar.props().state.should.be.false;
+
+        const remainingRows = component.findAllComponents(EntityMetadataRow);
+        remainingRows.length.should.equal(1);
+
+        const deletedEntitiesButton = component.find('.toggle-deleted-entities');
+        deletedEntitiesButton.text().should.equal('2 deleted Entities');
+      }));
+
+    it('shows alert on failure of bulk delete request', () => loadEntityList()
+      .complete()
+      .request(async component => {
+        const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+        await checkboxes[0].setValue(true);
+        await checkboxes[1].setValue(true);
+        return component.find('.action-bar-container .btn-primary').trigger('click');
+      })
+      .beforeEachResponse((_, { url }) => {
+        url.should.equal('/v1/projects/1/datasets/trees/entities/bulk-delete');
+      })
+      .respondWithProblem(500.1)
+      .afterResponse(component => {
+        component.should.alert('danger');
+      }));
+
+    it('handles try again button when bulk delete fails', () => load('/projects/1/entity-lists/trees/entities')
+      .complete()
+      .request(async component => {
+        const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+        await checkboxes[0].setValue(true);
+        await checkboxes[1].setValue(true);
+        return component.find('.action-bar-container .btn-primary').trigger('click');
+      })
+      .respondWithProblem(500.1)
+      .complete()
+      .request(component => {
+        const tryAgainButton = component.find('.alert .btn');
+        return tryAgainButton.trigger('click');
+      })
+      .beforeEachResponse((_, { url, data }) => {
+        url.should.equal('/v1/projects/1/datasets/trees/entities/bulk-delete');
+        const entities = testData.extendedEntities.sorted();
+        const expectedUUIDs = [entities[0].uuid, entities[1].uuid];
+        data.ids.should.eql(expectedUUIDs);
+      })
+      .respondWithSuccess()
+      .afterResponse(component => {
+        const remainingRows = component.findAllComponents(EntityMetadataRow);
+        remainingRows.length.should.equal(1);
+        const actionBar = component.findComponent({ name: 'ActionBar' });
+        actionBar.props().state.should.be.false;
+      }));
+
+    it('should undo the bulk delete', () => load('/projects/1/entity-lists/trees/entities')
+      .complete()
+      .request(async component => {
+        const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+        await checkboxes[0].setValue(true);
+        await checkboxes[1].setValue(true);
+        return component.find('.action-bar-container .btn-primary').trigger('click');
+      })
+      .respondWithSuccess()
+      .complete()
+      .request(component => {
+        const undoButton = component.find('.alert .btn');
+        return undoButton.trigger('click');
+      })
+      .beforeEachResponse((_, { url }) => {
+        url.should.equal('/v1/projects/1/datasets/trees/entities/bulk-restore');
+      })
+      .respondWithSuccess()
+      .afterResponse(component => {
+        const remainingRows = component.findAllComponents(EntityMetadataRow);
+        remainingRows.length.should.equal(3);
+        const deletedEntitiesButton = component.find('.toggle-deleted-entities');
+        deletedEntitiesButton.exists().should.be.false;
+      }));
+
+    it('shows alert when bulk restore fails and doesnt show action bar on hiding the alert', () => loadEntityList()
+      .complete()
+      .request(async component => {
+        // First perform bulk delete to have entities to restore
+        const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+        await checkboxes[0].setValue(true);
+        return component.find('.action-bar-container .btn-primary').trigger('click');
+      })
+      .respondWithSuccess()
+      .complete()
+      .request(component => component.vm.$container.alert.cta.handler())
+      .beforeEachResponse((_, { url }) => {
+        url.should.equal('/v1/projects/1/datasets/trees/entities/bulk-restore');
+      })
+      .respondWithProblem(500.1)
+      .afterResponse(component => {
+        component.should.alert('danger');
+        component.vm.alert.last.hide();
+        const actionBar = component.findComponent({ name: 'ActionBar' });
+        actionBar.props().state.should.be.false;
+      }));
+
+    it('handles try again button when bulk restore fails', () => load('/projects/1/entity-lists/trees/entities')
+      .complete()
+      .request(async component => {
+        const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+        await checkboxes[0].setValue(true);
+        await checkboxes[1].setValue(true);
+        return component.find('.action-bar-container .btn-primary').trigger('click');
+      })
+      .respondWithSuccess()
+      .complete()
+      .request(component => {
+        const undoButton = component.find('.alert .btn');
+        return undoButton.trigger('click');
+      })
+      .respondWithProblem(500.1)
+      .complete()
+      .request(component => {
+        const tryAgainButton = component.find('.alert .btn');
+        return tryAgainButton.trigger('click');
+      })
+      .beforeEachResponse((_, { url, data }) => {
+        url.should.equal('/v1/projects/1/datasets/trees/entities/bulk-restore');
+        const entities = testData.extendedEntities.sorted();
+        const expectedUUIDs = [entities[0].uuid, entities[1].uuid];
+        data.ids.should.eql(expectedUUIDs);
+      })
+      .respondWithSuccess()
+      .afterResponse(component => {
+        const remainingRows = component.findAllComponents(EntityMetadataRow);
+        remainingRows.length.should.equal(3); // All 3 entities should be back
+        const actionBar = component.findComponent({ name: 'ActionBar' });
+        actionBar.props().state.should.be.false;
+      }));
+
+    it('hides alert when entities are selected', async () => {
+      const component = await loadEntityList();
+
+      // Show an alert first
+      component.vm.alert.info('Some alert message');
+      component.vm.alert.state.should.be.true;
+
+      // Select an entity by clicking its checkbox - this should hide the alert
+      const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+      await checkboxes[0].setValue(true);
+
+      component.vm.alert.state.should.be.false;
+    });
+
+    it('removes entity from selection when individually deleted', () => loadEntityList()
+      .complete()
+      .request(async component => {
+        const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+        await checkboxes[0].setValue(true);
+        await checkboxes[1].setValue(true);
+
+        const actionBar = component.findComponent({ name: 'ActionBar' });
+        actionBar.props().state.should.be.true;
+        actionBar.props().message.should.equal('2 Entities selected');
+
+        await component.get('.entity-metadata-row:first-child .delete-button').trigger('click');
+        return component.get('#entity-delete .btn-danger').trigger('click');
+      })
+      .respondWithSuccess()
+      .afterResponse(async component => {
+        const actionBar = component.findComponent({ name: 'ActionBar' });
+        actionBar.props().state.should.be.true;
+        actionBar.props().message.should.equal('1 Entity selected');
+      }));
+
+    it('clears selected entities when action bar close button is pressed', async () => {
+      const component = await loadEntityList();
+
+      const checkboxes = component.findAll('.entity-metadata-row input[type="checkbox"]');
+      await checkboxes[0].setValue(true);
+      await checkboxes[1].setValue(true);
+
+      const actionBar = component.findComponent({ name: 'ActionBar' });
+      actionBar.props().state.should.be.true;
+      actionBar.props().message.should.equal('2 Entities selected');
+
+      await actionBar.find('.close').trigger('click');
+
+      actionBar.props().state.should.be.false;
+      checkboxes[0].element.checked.should.be.false;
+      checkboxes[1].element.checked.should.be.false;
+    });
+  });
+
+  it('sets allSelected to false when all entities on current page are deleted and user navigates to next page', () => {
+    createEntities(251);
+    return loadEntityList()
+      .complete()
+      .request(async component => {
+        const headerCheckbox = component.find('#entity-table input[type="checkbox"]');
+        await headerCheckbox.setValue(true);
+        return component.find('.action-bar-container .btn-primary').trigger('click');
+      })
+      .respondWithSuccess()
+      .complete()
+      .request(component => component.find('button[aria-label="Next page"]').trigger('click'))
+      .respondWithData(() => testData.entityOData(1, 250))
+      .afterResponse(component => {
+        const headerCheckbox = component.find('#entity-table input[type="checkbox"]');
+        headerCheckbox.element.checked.should.be.false;
+      });
+  });
+
+  it('preserves select all checkbox state when edit modal is cancelled', async () => {
+    createEntities(3);
+    const component = await loadEntityList();
+
+    const headerCheckbox = component.find('#entity-table input[type="checkbox"]');
+    await headerCheckbox.setValue(true);
+    headerCheckbox.element.checked.should.be.true;
+
+    await component.get('.entity-metadata-row:first-child .update-button').trigger('click');
+
+    await component.get('#entity-update .btn-link').trigger('click');
+
+    headerCheckbox.element.checked.should.be.true;
+  });
+
+  it('unchecks select all checkbox when action bar close button is pressed', async () => {
+    createEntities(3);
+    const component = await loadEntityList();
+
+    const headerCheckbox = component.find('#entity-table input[type="checkbox"]');
+    await headerCheckbox.setValue(true);
+    headerCheckbox.element.checked.should.be.true;
+
+    const actionBar = component.findComponent({ name: 'ActionBar' });
+    await actionBar.find('.close').trigger('click');
+
+    headerCheckbox.element.checked.should.be.false;
+  });
 });
diff --git a/test/components/entity/metadata-row.spec.js b/test/components/entity/metadata-row.spec.js
index 04c85dee9..dfc27f1ec 100644
--- a/test/components/entity/metadata-row.spec.js
+++ b/test/components/entity/metadata-row.spec.js
@@ -42,7 +42,7 @@ describe('EntityMetadataRow', () => {
     const creator = testData.extendedUsers.first();
     testData.extendedEntities.createPast(1, { creator }).last();
     const row = mountComponent();
-    const td = row.findAll('td')[1];
+    const td = row.findAll('td')[2];
     td.classes('creator-name').should.be.true;
     td.text().should.equal(creator.displayName);
     await td.get('span').should.have.textTooltip();
diff --git a/test/components/entity/table.spec.js b/test/components/entity/table.spec.js
index bb6bbc36f..c043f0a4f 100644
--- a/test/components/entity/table.spec.js
+++ b/test/components/entity/table.spec.js
@@ -43,6 +43,7 @@ describe('EntityTable', () => {
       const table = component.get('.table-freeze-frozen');
       headers(table).should.eql([
         'Row',
+        '',
         'Created by',
         'Created at',
         'Last Updated / Actions'
diff --git a/test/components/radio-field.spec.js b/test/components/radio-field.spec.js
new file mode 100644
index 000000000..c1287ee77
--- /dev/null
+++ b/test/components/radio-field.spec.js
@@ -0,0 +1,59 @@
+import RadioField from '../../src/components/radio-field.vue';
+
+import { mount } from '../util/lifecycle';
+
+describe('RadioField', () => {
+  it('uses the options prop', () => {
+    const component = mount(RadioField, {
+      props: {
+        options: [
+          { value: 'jan', text: 'January' },
+          { value: 'feb', text: 'February' }
+        ],
+        modelValue: 'jan'
+      }
+    });
+
+    const values = component.findAll('input').map(input => input.attributes().value);
+    values.should.eql(['jan', 'feb']);
+
+    const text = component.findAll('label').map(label => label.text());
+    text.should.eql(['January', 'February']);
+  });
+
+  it('uses the modelValue prop', async () => {
+    const component = mount(RadioField, {
+      props: {
+        // Using numeric values, not string, in order to confirm that values are
+        // not converted to string in all circumstances.
+        options: [{ value: 1, text: 'one' }, { value: 2, text: 'two' }],
+        modelValue: 2
+      }
+    });
+    component.get('input:checked').attributes().value.should.equal('2');
+    await component.get('input').setChecked();
+    component.emitted('update:modelValue').should.eql([[1]]);
+    await component.setProps({ modelValue: 1 });
+    component.get('input:checked').attributes().value.should.equal('1');
+  });
+
+  it('uses the disabled prop', () => {
+    const component = mount(RadioField, {
+      props: {
+        options: [{ value: 1, text: 'one' }, { value: 2, text: 'two' }],
+        modelValue: 1,
+        disabled: true,
+        disabledMessage: 'It is disabled.'
+      }
+    });
+
+    for (const radio of component.findAll('.radio')) {
+      radio.classes('disabled').should.be.true;
+      const input = radio.get('input');
+      input.element.disabled.should.be.true;
+      input.should.have.ariaDescription('It is disabled.');
+    }
+
+    component.should.have.tooltip('It is disabled.');
+  });
+});
diff --git a/test/components/submission/list.spec.js b/test/components/submission/list.spec.js
index 5ae542242..72b45bb9a 100644
--- a/test/components/submission/list.spec.js
+++ b/test/components/submission/list.spec.js
@@ -27,36 +27,27 @@ describe('SubmissionList', () => {
   describe('initial requests', () => {
     it('sends the correct requests for a form', () => {
       testData.extendedForms.createPast(1, { xmlFormId: 'a b' });
-      let count = 0;
-      return loadSubmissionList()
-        .beforeEachResponse((_, { url }, i) => {
-          count += 1;
-          if (i === 0)
-            url.should.equal('/v1/projects/1/forms/a%20b/fields?odata=true');
-          else if (i === 1)
-            url.should.startWith('/v1/projects/1/forms/a%20b.svc/Submissions?');
-          else
-            url.should.equal('/v1/projects/1/forms/a%20b/submissions/submitters');
-        })
-        .afterResponses(() => {
-          count.should.equal(3);
-        });
+      return loadSubmissionList().testRequests([
+        { url: '/v1/projects/1/forms/a%20b/fields?odata=true' },
+        { url: '/v1/projects/1/forms/a%20b/submissions/submitters' },
+        {
+          url: ({ pathname }) => {
+            pathname.should.equal('/v1/projects/1/forms/a%20b.svc/Submissions');
+          }
+        }
+      ]);
     });
 
     it('sends the correct requests for a form draft', () => {
       testData.extendedForms.createPast(1, { xmlFormId: 'a b', draft: true });
-      let count = 0;
-      return loadSubmissionList()
-        .beforeEachResponse((_, { url }, i) => {
-          count += 1;
-          if (i === 0)
-            url.should.equal('/v1/projects/1/forms/a%20b/draft/fields?odata=true');
-          else
-            url.should.startWith('/v1/projects/1/forms/a%20b/draft.svc/Submissions?');
-        })
-        .afterResponses(() => {
-          count.should.equal(2);
-        });
+      return loadSubmissionList().testRequests([
+        { url: '/v1/projects/1/forms/a%20b/draft/fields?odata=true' },
+        {
+          url: ({ pathname }) => {
+            pathname.should.equal('/v1/projects/1/forms/a%20b/draft.svc/Submissions');
+          }
+        }
+      ]);
     });
   });
 
@@ -77,8 +68,8 @@ describe('SubmissionList', () => {
   describe('after the refresh button is clicked', () => {
     it('completes a background refresh', () => {
       testData.extendedSubmissions.createPast(1);
-      const assertRowCount = (count, responseIndex = 0) => (component, _, i) => {
-        if (i === responseIndex) {
+      const assertRowCount = (count) => (component, _, i) => {
+        if (i === 0 || i == null) {
           component.findAllComponents(SubmissionMetadataRow).length.should.equal(count);
           component.findAllComponents(SubmissionDataRow).length.should.equal(count);
         }
@@ -587,8 +578,7 @@ describe('SubmissionList', () => {
     const loadDeletedSubmissions = () => {
       testData.extendedSubmissions.createPast(1, { instanceId: 'e', deletedAt: new Date().toISOString() });
       return load('/projects/1/forms/f/submissions?deleted=true', { root: false }, {
-        deletedSubmissionCount: false,
-        odata: testData.submissionDeletedOData
+        deletedSubmissionCount: false
       });
     };
 
@@ -666,8 +656,7 @@ describe('SubmissionList', () => {
 
       it('hides the table', () =>
         load('/projects/1/forms/f/submissions?deleted=true', { root: false, attachTo: document.body }, {
-          deletedSubmissionCount: false,
-          odata: testData.submissionDeletedOData
+          deletedSubmissionCount: false
         })
           .complete()
           .request(restore(1))
@@ -683,8 +672,7 @@ describe('SubmissionList', () => {
 
       it('shows a message', () =>
         load('/projects/1/forms/f/submissions?deleted=true', { root: false }, {
-          deletedSubmissionCount: false,
-          odata: testData.submissionDeletedOData
+          deletedSubmissionCount: false
         })
           .complete()
           .request(restore(1))
@@ -703,8 +691,7 @@ describe('SubmissionList', () => {
     it('continues to show modal if checkbox was not checked', () => {
       testData.extendedSubmissions.createPast(2, { deletedAt: new Date().toISOString() });
       return load('/projects/1/forms/f/submissions?deleted=true', { root: false }, {
-        deletedSubmissionCount: false,
-        odata: testData.submissionDeletedOData
+        deletedSubmissionCount: false
       })
         .complete()
         .request(async (component) => {
@@ -725,8 +712,7 @@ describe('SubmissionList', () => {
           .createPast(1, { instanceId: 'e1', deletedAt: new Date().toISOString() })
           .createPast(1, { instanceId: 'e2', deletedAt: new Date().toISOString() });
         return load('/projects/1/forms/f/submissions?deleted=true', { root: false }, {
-          deletedSubmissionCount: false,
-          odata: testData.submissionDeletedOData
+          deletedSubmissionCount: false
         })
           .complete()
           .request(async (component) => {
diff --git a/test/components/submission/map-view.spec.js b/test/components/submission/map-view.spec.js
new file mode 100644
index 000000000..e84835cbc
--- /dev/null
+++ b/test/components/submission/map-view.spec.js
@@ -0,0 +1,317 @@
+import { F } from 'ramda';
+
+import GeojsonMap from '../../../src/components/geojson-map.vue';
+import RadioField from '../../../src/components/radio-field.vue';
+import SubmissionList from '../../../src/components/submission/list.vue';
+import SubmissionMapView from '../../../src/components/submission/map-view.vue';
+
+import testData from '../../data';
+import { changeMultiselect } from '../../util/trigger';
+import { findTab } from '../../util/dom';
+import { load } from '../../util/http';
+import { mockLogin } from '../../util/session';
+import { setLuxon } from '../../util/date-time';
+
+const findToggle = (component) =>
+  component.getComponent(SubmissionList).findComponent(RadioField);
+const toggleView = (view) => (app) =>
+  findToggle(app).get(`input[type="radio"][value="${view}"]`).setChecked();
+const getView = (app) => {
+  // SubmissionTableView always renders #submission-table.
+  const hasTable = app.find('#submission-table').exists();
+  // In contrast, SubmissionMapView doesn't always render .geojson-map.
+  const hasMap = app.findComponent(SubmissionMapView).exists();
+  if (hasTable && hasMap) throw new Error('both views are rendered');
+  if (!hasTable && !hasMap) throw new Error('neither view is rendered');
+  return hasTable ? 'table' : 'map';
+};
+
+const mypoint = testData.fields.geopoint('/mypoint');
+
+describe('SubmissionMapView', () => {
+  beforeEach(mockLogin);
+
+  describe('toggle', () => {
+    it('shows the toggle if the form has a geo field', async () => {
+      testData.extendedForms.createPast(1, { fields: [mypoint] });
+      const app = await load('/projects/1/forms/f/submissions');
+      findToggle(app).exists().should.be.true;
+    });
+
+    it('does not show toggle if form does not have a geo field', async () => {
+      testData.extendedForms.createPast(1);
+      const app = await load('/projects/1/forms/f/submissions');
+      findToggle(app).exists().should.be.false;
+    });
+
+    it('does not show toggle if the only geo field is in a repeat group', async () => {
+      testData.extendedForms.createPast(1, {
+        fields: [
+          testData.fields.repeat('/plot'),
+          testData.fields.geopoint('/plot/plotpoint')
+        ]
+      });
+      const app = await load('/projects/1/forms/f/submissions');
+      findToggle(app).exists().should.be.false;
+    });
+
+    it('does not show toggle on Edit Form page', async () => {
+      testData.extendedForms.createPast(1, { draft: true, fields: [mypoint] });
+      const app = await load('/projects/1/forms/f/draft');
+      findToggle(app).exists().should.be.false;
+    });
+
+    it('disables the toggle if there is an encrypted submission', async () => {
+      testData.extendedForms.createPast(1, {
+        fields: [mypoint],
+        key: testData.standardKeys.createPast(1, { managed: true }).last()
+      });
+      const app = await load('/projects/1/forms/f/submissions');
+      findToggle(app).props().disabled.should.be.true;
+    });
+
+    it('switches to map view', () => {
+      testData.extendedForms.createPast(1, {
+        xmlFormId: 'a b',
+        fields: [mypoint]
+      });
+      return load('/projects/1/forms/a%20b/submissions')
+        .complete()
+        .request(toggleView('map'))
+        .respondWithData(testData.submissionGeojson)
+        .testRequests([{ url: '/v1/projects/1/forms/a%20b/submissions.geojson' }])
+        .afterResponses(app => {
+          getView(app).should.equal('map');
+          expect(app.vm.$route.query.map).to.equal('true');
+        });
+    });
+
+    it('switches back to table view', () => {
+      testData.extendedForms.createPast(1, { fields: [mypoint] });
+      return load('/projects/1/forms/f/submissions')
+        .complete()
+        .request(toggleView('map'))
+        .respondWithData(testData.submissionGeojson)
+        .complete()
+        .request(toggleView('table'))
+        .respondWithData(testData.submissionOData)
+        .testRequests([{
+          url: ({ pathname }) => {
+            pathname.should.equal('/v1/projects/1/forms/f.svc/Submissions');
+          }
+        }])
+        .afterResponses(app => {
+          getView(app).should.equal('table');
+          should.not.exist(app.vm.$route.query.map);
+        });
+    });
+  });
+
+  it('shows map view immediately if ?map=true', () => {
+    testData.extendedForms.createPast(1, { fields: [mypoint] });
+    return load('/projects/1/forms/f/submissions?map=true')
+      .testRequestsInclude([{ url: '/v1/projects/1/forms/f/submissions.geojson' }])
+      .afterResponses(app => {
+        getView(app).should.equal('map');
+      });
+  });
+
+  describe('filters', () => {
+    beforeEach(() => {
+      setLuxon({ defaultZoneName: 'UTC' });
+      testData.extendedForms.createPast(1, { fields: [mypoint] });
+    });
+
+    it('passes filters through to the request', () =>
+      load('/projects/1/forms/f/submissions?map=true&submitterId=1&submitterId=2&start=1970-01-01&end=1970-01-02&reviewState=%27approved%27&reviewState=null')
+        .testRequestsInclude([{
+          url: ({ pathname, searchParams }) => {
+            pathname.should.equal('/v1/projects/1/forms/f/submissions.geojson');
+            searchParams.getAll('submitterId').should.eql(['1', '2']);
+            searchParams.get('start__gte').should.equal('1970-01-01T00:00:00.000Z');
+            searchParams.get('end__lte').should.equal('1970-01-02T23:59:59.999Z');
+            searchParams.getAll('reviewState').should.eql(['approved', 'null']);
+          }
+        }]));
+
+    it('refreshes the map after a filter changes', () => {
+      testData.extendedSubmissions.createPast(1, {
+        mypoint: 'POINT (1 2)',
+        reviewState: 'hasIssues'
+      });
+      return load('/projects/1/forms/f/submissions?map=true', { attachTo: document.body })
+        .afterResponses(app => {
+          app.find('.geojson-map').exists().should.be.true;
+        })
+        .request(changeMultiselect('#submission-filters-review-state', [1]))
+        .beforeEachResponse((app, { url }) => {
+          url.should.equal('/v1/projects/1/forms/f/submissions.geojson?reviewState=hasIssues');
+          // Not a background refresh: the map disappears during the request.
+          app.find('.geojson-map').exists().should.be.false;
+        })
+        .respondWithData(testData.submissionGeojson)
+        .afterResponse(app => {
+          app.find('.geojson-map').exists().should.be.true;
+        });
+    });
+  });
+
+  describe('deleted submissions', () => {
+    beforeEach(() => {
+      testData.extendedForms.createPast(1, { fields: [mypoint] });
+    });
+
+    it('shows map view for deleted submissions', () => {
+      testData.extendedSubmissions.createPast(1, { deletedAt: new Date().toISOString() });
+      return load('/projects/1/forms/f/submissions?map=true&deleted=true')
+        .testRequestsInclude([{
+          url: '/v1/projects/1/forms/f/submissions.geojson?deleted=true'
+        }])
+        .afterResponses(app => {
+          getView(app).should.equal('map');
+        });
+    });
+
+    it('preserves map view while toggling deleted submissions', () => {
+      testData.extendedSubmissions.createPast(1, { deletedAt: new Date().toISOString() });
+      return load('/projects/1/forms/f/submissions?map=true&reviewState=null')
+        .complete()
+        .request(app => app.get('.toggle-deleted-submissions').trigger('click'))
+        .respondWithData(testData.submissionGeojson)
+        .testRequestsInclude([{
+          // Map view is preserved, but the review state filter is not.
+          url: '/v1/projects/1/forms/f/submissions.geojson?deleted=true'
+        }])
+        .afterResponse(app => {
+          getView(app).should.equal('map');
+          const { fullPath } = app.vm.$route;
+          fullPath.should.equal('/projects/1/forms/f/submissions?deleted=true&map=true');
+        })
+        .request(app => app.get('.toggle-deleted-submissions').trigger('click'))
+        .respondWithData(() => testData.submissionGeojson(F))
+        .afterResponse(app => {
+          getView(app).should.equal('map');
+          const { fullPath } = app.vm.$route;
+          fullPath.should.equal('/projects/1/forms/f/submissions?map=true');
+        });
+    });
+  });
+
+  describe('after the Refresh button is clicked', () => {
+    beforeEach(() => {
+      testData.extendedForms.createPast(1, { fields: [mypoint] });
+    });
+
+    it('sends the correct requests', () =>
+      load('/projects/1/forms/f/submissions?map=true')
+        .complete()
+        .request(app =>
+          app.get('#submission-list-refresh-button').trigger('click'))
+        .respondWithData(testData.submissionGeojson)
+        .respondWithData(() => testData.submissionDeletedOData(0))
+        .testRequests([
+          { url: '/v1/projects/1/forms/f/submissions.geojson' },
+          {
+            // deletedSubmissionCount
+            url: ({ pathname, searchParams }) => {
+              pathname.should.equal('/v1/projects/1/forms/f.svc/Submissions');
+              searchParams.get('$filter').should.equal('__system/deletedAt ne null');
+              searchParams.get('$top').should.equal('0');
+            }
+          }
+        ]));
+
+    it('updates the map', () => {
+      testData.extendedSubmissions.createPast(1, { mypoint: 'POINT (1 2)' });
+      const assertCount = (app, count) => {
+        const { features } = app.getComponent(GeojsonMap).props();
+        features.length.should.equal(count);
+      };
+      return load('/projects/1/forms/f/submissions?map=true')
+        .afterResponses(app => {
+          assertCount(app, 1);
+        })
+        .request(app =>
+          app.get('#submission-list-refresh-button').trigger('click'))
+        .beforeEachResponse((app, _, i) => {
+          if (i === 0) assertCount(app, 1);
+        })
+        .respondWithData(() => {
+          testData.extendedSubmissions.createNew();
+          return testData.submissionGeojson();
+        })
+        .respondWithData(() => testData.submissionDeletedOData(0))
+        .afterResponses(app => {
+          assertCount(app, 2);
+        });
+    });
+  });
+
+  describe('empty message', () => {
+    beforeEach(() => {
+      testData.extendedForms.createPast(1, { fields: [mypoint] });
+    });
+
+    it('shows a message if no submissions are returned', async () => {
+      const app = await load('/projects/1/forms/f/submissions?map=true');
+      const message = app.get('.empty-table-message');
+      message.should.be.visible();
+      message.text().should.equal('There are no Submissions yet.');
+      app.find('.geojson-map').exists().should.be.false;
+    });
+
+    it('shows a different message if a filter is applied', async () => {
+      const app = await load('/projects/1/forms/f/submissions?map=true&reviewState=null');
+      const message = app.get('.empty-table-message');
+      message.should.be.visible();
+      message.text().should.equal('There are no matching Submissions.');
+      app.find('.geojson-map').exists().should.be.false;
+    });
+
+    it('hides the empty message after toggling to map view', () =>
+      load('/projects/1/forms/f/submissions')
+        .afterResponses(app => {
+          app.get('.empty-table-message').should.be.visible();
+        })
+        .request(toggleView('map'))
+        .beforeEachResponse(app => {
+          // The message should disappear immediately, not just after the
+          // GeoJSON response is received.
+          app.get('.empty-table-message').should.be.hidden();
+        })
+        .respondWithData(() => {
+          testData.extendedSubmissions.createNew({ mypoint: 'POINT (1 2)' });
+          return testData.submissionGeojson();
+        })
+        .afterResponse(app => {
+          app.get('.empty-table-message').should.be.hidden();
+          app.find('.geojson-map').exists().should.be.true;
+        }));
+  });
+
+  // Submissions with geo data are a subset of all submissions, so we don't show
+  // the count of all submissions when loading the map.
+  it('does not show the submission count in the loading message', () => {
+    testData.extendedForms.createPast(1, { fields: [mypoint] });
+    testData.extendedSubmissions.createPast(1, { mypoint: 'POINT (1 2)' });
+    return load('/projects/1/forms/f/submissions')
+      .complete()
+      .request(toggleView('map'))
+      .beforeAnyResponse(app => {
+        app.get('#odata-loading-message').text().should.equal('Loading Submissions…');
+      })
+      .respondWithData(testData.submissionGeojson);
+  });
+
+  it('does not update the tab badge', async () => {
+    testData.extendedForms.createPast(1, { fields: [mypoint], submissions: 2 });
+    testData.extendedSubmissions
+      .createPast(1, { mypoint: 'POINT (1 2)' })
+      .createPast(1, { mypoint: null });
+    const app = await load('/projects/1/forms/f/submissions?map=true');
+    app.getComponent(GeojsonMap).props().features.length.should.equal(1);
+    // Even though there is only one submission in the GeoJSON, that should not
+    // change the submission count in the tab badge.
+    findTab(app, 'Submissions').get('.badge').text().should.equal('2');
+  });
+});
diff --git a/test/composables/enketo-redirector.spec.js b/test/composables/enketo-redirector.spec.js
index 841d2d61d..6cb198658 100644
--- a/test/composables/enketo-redirector.spec.js
+++ b/test/composables/enketo-redirector.spec.js
@@ -29,6 +29,16 @@ describe('useEnketoRedirector', () => {
         });
     });
 
+    it('should pass query parameters as it is after redirection', () => {
+      testData.extendedForms.createPast(1, { xmlFormId: 'a' });
+      return load(`/f/${enketoId}/new?d[firstname]=john%20doe`)
+        .afterResponses(app => {
+          const iframe = app.find('iframe');
+          const src = iframe.attributes('src');
+          src.should.contain('john%20doe');
+        });
+    });
+
     it('should redirect to new draft submission page', () => {
       testData.extendedForms.createPast(1, { xmlFormId: 'a', publishedAt: null, draft: true });
       return load(`/f/${enketoId}/new`)
diff --git a/test/data/submissions.js b/test/data/submissions.js
index 41613b7c6..85ce8cd61 100644
--- a/test/data/submissions.js
+++ b/test/data/submissions.js
@@ -1,6 +1,6 @@
 import { faker } from '@faker-js/faker';
 import { DateTime } from 'luxon';
-import { clone, comparator, hasPath, lensPath, set } from 'ramda';
+import { T, clone, comparator, hasPath, lensPath, path as getPath, set } from 'ramda';
 
 import { dataStore, view } from './data-store';
 import { extendedForms } from './forms';
@@ -68,6 +68,27 @@ const randomOData = (instanceId, versionFields, partial) => versionFields
     partial
   );
 
+const odataToGeojson = (odata, versionFields) => {
+  const field = versionFields.find(({ type }) => type === 'geopoint');
+  if (field == null) return null;
+  const path = field.path.split('/');
+  path.shift();
+  const value = getPath(path, odata);
+  if (value == null) return null;
+  const match = value.match(/\d+(\.\d+)?/g);
+  if (match == null) return null;
+  const coordinates = match.map(s => Number.parseInt(s, 10));
+  return {
+    type: 'Feature',
+    id: odata.__id,
+    geometry: {
+      type: 'GeometryCollection',
+      geometries: [{ type: 'Point', coordinates }]
+    },
+    properties: { fieldpath: field.path }
+  };
+};
+
 // eslint-disable-next-line import/prefer-default-export
 export const extendedSubmissions = dataStore({
   factory: ({
@@ -158,7 +179,8 @@ export const extendedSubmissions = dataStore({
       // An actual submission JSON response does not have this property. We
       // include it here so that it is easy to match submission data and
       // metadata during testing.
-      _odata: odata
+      _odata: odata,
+      _geojson: odataToGeojson(odata, formVersion._fields)
     };
   },
   sort: comparator((submission1, submission2) =>
@@ -188,3 +210,11 @@ const restToOData = (filterExpression) => (top = 250, skip = 0) => {
 export const submissionOData = restToOData(submission => submission.deletedAt == null);
 
 export const submissionDeletedOData = restToOData(submission => submission.deletedAt != null);
+
+export const submissionGeojson = (filterExpression = T) => ({
+  type: 'FeatureCollection',
+  features: extendedSubmissions.sorted()
+    .filter(filterExpression)
+    .filter(submission => submission._geojson != null)
+    .map(submission => submission._geojson)
+});
diff --git a/test/request-data/resource.spec.js b/test/request-data/resource.spec.js
index e472c23cd..f284e5c84 100644
--- a/test/request-data/resource.spec.js
+++ b/test/request-data/resource.spec.js
@@ -7,7 +7,37 @@ import testData from '../data';
 import { mockHttp } from '../util/http';
 
 describe('createResource()', () => {
+  describe('setting data', () => {
+    it('updates setAt', () => {
+      const projectData = testData.extendedProjects.createNew();
+      const { requestData } = createTestContainer();
+      should.not.exist(requestData.project.setAt);
+
+      requestData.project.data = projectData;
+      requestData.project.setAt.should.be.an.instanceOf(Date);
+
+      const oldSetAt = requestData.project.setAt;
+      requestData.project.data = null;
+      const newSetAt = requestData.project.setAt;
+      newSetAt.should.be.an.instanceOf(Date);
+      newSetAt.should.not.equal(oldSetAt);
+    });
+  });
+
   describe('request()', () => {
+    it('updates setAt', () => {
+      const projectData = testData.standardProjects.createNew();
+      const container = createTestContainer();
+      const { requestData } = container;
+      should.not.exist(requestData.project.setAt);
+      return mockHttp(container)
+        .request(() => requestData.project.request({ url: '/v1/projects/1' }))
+        .respondWithData(() => projectData)
+        .afterResponse(() => {
+          requestData.project.setAt.should.be.an.instanceOf(Date);
+        });
+    });
+
     describe('patch', () => {
       it('throws an error if clear option is true', () => {
         const { requestData } = createTestContainer({
@@ -22,7 +52,7 @@ describe('createResource()', () => {
       });
 
       it('passes the response and the resource to the callback', () => {
-        const projectData = testData.extendedProjects.createNew();
+        const projectData = testData.standardProjects.createNew();
         const container = createTestContainer({
           requestData: { project: projectData }
         });
@@ -43,6 +73,29 @@ describe('createResource()', () => {
           });
       });
 
+      it('updates patchedAt', () => {
+        const projectData = testData.standardProjects.createNew();
+        const container = createTestContainer({
+          requestData: { project: projectData }
+        });
+        const { requestData } = container;
+
+        should.not.exist(requestData.project.patchedAt);
+        const oldSetAt = requestData.project.setAt;
+
+        return mockHttp(container)
+          .request(() => requestData.project.request({
+            url: '/v1/projects/1',
+            patch: noop
+          }))
+          .respondWithData(() => projectData)
+          .afterResponse(() => {
+            requestData.project.patchedAt.should.be.an.instanceOf(Date);
+            // It should only update patchedAt, not setAt.
+            requestData.project.setAt.should.equal(oldSetAt);
+          });
+      });
+
       describe('resource is cleared during the request', () => {
         it('returns a rejected promise', () => {
           const projectData = testData.extendedProjects.createNew();
diff --git a/test/unit/request.spec.js b/test/unit/request.spec.js
index 53fac49b6..478559cc2 100644
--- a/test/unit/request.spec.js
+++ b/test/unit/request.spec.js
@@ -16,6 +16,14 @@ describe('util/request', () => {
       queryString({ x: 1, y: null }).should.eql('?x=1');
     });
 
+    it('supports arrays', () => {
+      queryString({ x: [1, 2] }).should.equal('?x=1&x=2');
+    });
+
+    it('allows an array to include null', () => {
+      queryString({ x: [1, null] }).should.equal('?x=1&x=null');
+    });
+
     it('returns an empty string for an empty object', () => {
       queryString({}).should.equal('');
     });
diff --git a/test/util/entity.js b/test/util/entity.js
index 8162593b2..b06e76768 100644
--- a/test/util/entity.js
+++ b/test/util/entity.js
@@ -30,5 +30,6 @@ export const loadEntityList = (mountOptions = {}) => {
   const { deleted } = mergedOptions.props;
   return mockHttp()
     .mount(EntityList, mergedOptions)
-    .respondWithData(() => (deleted ? testData.entityDeletedOData() : testData.entityOData()));
+    .respondWithData(() => (deleted ? testData.entityDeletedOData() : testData.entityOData()))
+    .respondWithData(() => testData.extendedFieldKeys.sorted());
 };
diff --git a/test/util/http.js b/test/util/http.js
index ddca8b8a8..948cea14f 100644
--- a/test/util/http.js
+++ b/test/util/http.js
@@ -462,7 +462,10 @@ class MockHttp {
         if (Array.isArray(response)) {
           return series.respondIf(
             response[0],
-            () => mockResponse.of((option ?? response[1])())
+            (config) => {
+              const f = option ?? response[1];
+              return mockResponse.of(f(config));
+            }
           );
         }
         throw new Error(`invalid response for component ${componentName}`);
@@ -699,7 +702,7 @@ class MockHttp {
       let isOrdered = false;
       for (const [i, [f, ifCallback]] of this._respondIf.entries()) {
         if (!respondedIf.has(i) && f(config)) {
-          responseCallback = ifCallback;
+          responseCallback = () => ifCallback(config);
           respondedIf.add(i);
           break;
         }
diff --git a/test/util/http/data.js b/test/util/http/data.js
index 8c98a2651..ec11525df 100644
--- a/test/util/http/data.js
+++ b/test/util/http/data.js
@@ -3,10 +3,11 @@ import { pick } from 'ramda';
 import useForm from '../../../src/request-data/form';
 import useProject from '../../../src/request-data/project';
 import useDatasets from '../../../src/request-data/datasets';
+import { apiPaths } from '../../../src/util/request';
 
 import testData from '../../data';
 import { mockResponse } from '../axios';
-import { apiPaths } from '../../../src/util/request';
+import { relativeUrl } from '../request';
 
 // The names of the following properties correspond to requestData resources.
 const responseDefaults = {
@@ -132,14 +133,49 @@ const responsesByComponent = {
   }),
   FormSubmissions: componentResponses({
     keys: () => testData.standardKeys.sorted(),
-    deletedSubmissionCount: () => testData.submissionDeletedOData(0),
     fields: () => testData.extendedForms.last()._fields,
-    odata: testData.submissionOData,
     submitters: () => testData.extendedFieldKeys
       .sorted()
       .sort((fieldKey1, fieldKey2) =>
         fieldKey1.displayName.localeCompare(fieldKey2.displayName))
-      .map(testData.toActor)
+      .map(testData.toActor),
+    deletedSubmissionCount: [
+      ({ url }) => {
+        if (!url.includes('top=0')) return false;
+        return matchesApiPath(
+          (projectId, xmlFormId) => apiPaths.odataSubmissions(projectId, xmlFormId, false),
+          url
+        );
+      },
+      () => testData.submissionDeletedOData(0)
+    ],
+    odata: [
+      ({ url }) => {
+        if (url.includes('top=0')) return false;
+        return matchesApiPath(
+          (projectId, xmlFormId) => apiPaths.odataSubmissions(projectId, xmlFormId, false),
+          url
+        );
+      },
+      ({ url }) => {
+        const filter = relativeUrl(url).searchParams.get('$filter');
+        return filter.includes('__system/deletedAt eq null')
+          ? testData.submissionOData()
+          : testData.submissionDeletedOData();
+      }
+    ],
+    geojson: [
+      ({ url }) => matchesApiPath(
+        (projectId, xmlFormId) => apiPaths.submissions(projectId, xmlFormId, false, '.geojson'),
+        url
+      ),
+      ({ url }) => {
+        const filter = url.includes('deleted=true')
+          ? (submission) => submission.deletedAt != null
+          : (submission) => submission.deletedAt == null;
+        return testData.submissionGeojson(filter);
+      }
+    ]
   }),
   PublicLinkList: componentResponses({
     publicLinks: () => testData.standardPublicLinks.sorted()
@@ -173,7 +209,7 @@ const responsesByComponent = {
     ],
     odata: [
       ({ url }) => matchesApiPath((projectId, xmlFormId) => apiPaths.odataSubmissions(projectId, xmlFormId, true), url),
-      testData.submissionOData
+      () => testData.submissionOData()
     ]
   }),
   FormSettings: [],
@@ -198,7 +234,12 @@ const responsesByComponent = {
   DatasetOverview: [],
   DatasetEntities: componentResponses({
     deletedEntityCount: () => testData.entityDeletedOData(0),
-    odataEntities: true
+    odataEntities: true,
+    entityCreators: () => testData.extendedFieldKeys
+      .sorted()
+      .sort((fieldKey1, fieldKey2) =>
+        fieldKey1.displayName.localeCompare(fieldKey2.displayName))
+      .map(testData.toActor)
   }),
   DatasetSettings: [],
   EntityShow: componentResponses({
diff --git a/test/util/session.js b/test/util/session.js
index 23896b74e..0cdb7b7e2 100644
--- a/test/util/session.js
+++ b/test/util/session.js
@@ -1,7 +1,7 @@
 import { DateTime } from 'luxon';
 import { clone } from 'ramda';
-
 import { faker } from '@faker-js/faker';
+
 import testData from '../data';
 
 let loggedIn = false;
@@ -18,10 +18,10 @@ export const mockLogin = (options = undefined) => {
     DateTime.fromISO(expiresAt).toMillis().toString()
   );
 
-  loggedIn = true;
-
   const csrf = faker.string.alphanumeric(64);
   document.cookie = `__csrf=${csrf}`;
+
+  loggedIn = true;
 };
 
 mockLogin.setRequestData = (requestData) => {
@@ -37,4 +37,23 @@ mockLogin.setRequestData = (requestData) => {
   }
 };
 
-mockLogin.reset = () => { loggedIn = false; };
+// Undoes the effects of mockLogin().
+mockLogin.reset = () => {
+  if (!loggedIn) return;
+
+  if (testData.extendedUsers.size === 1 && testData.sessions.size === 1) {
+    testData.extendedUsers.reset();
+    testData.sessions.reset();
+  } else {
+    testData.extendedUsers.splice(0, 1);
+    testData.sessions.splice(0, 1);
+  }
+
+  localStorage.removeItem('sessionExpires');
+
+  document.cookie = document.cookie.split('; ')
+    .filter(cookie => !cookie.startsWith('__csrf='))
+    .join('; ');
+
+  loggedIn = false;
+};
diff --git a/test/util/submission.js b/test/util/submission.js
index e991afaa0..2c8a56512 100644
--- a/test/util/submission.js
+++ b/test/util/submission.js
@@ -39,7 +39,6 @@ export const loadSubmissionList = (mountOptions = {}) => {
   return mockHttp()
     .mount(SubmissionList, mergedOptions)
     .respondWithData(() => form._fields)
-    .respondWithData(() => (deleted ? testData.submissionDeletedOData() : testData.submissionOData()))
     .modify(series => {
       if (form.publishedAt == null) return series;
       return series.respondWithData(() => testData.extendedFieldKeys
@@ -47,5 +46,6 @@ export const loadSubmissionList = (mountOptions = {}) => {
         .sort((fieldKey1, fieldKey2) =>
           fieldKey1.displayName.localeCompare(fieldKey2.displayName))
         .map(testData.toActor));
-    });
+    })
+    .respondWithData(() => (deleted ? testData.submissionDeletedOData() : testData.submissionOData()));
 };
diff --git a/transifex/strings_en.json b/transifex/strings_en.json
index 80803c745..ec0ef8fb0 100644
--- a/transifex/strings_en.json
+++ b/transifex/strings_en.json
@@ -464,6 +464,10 @@
     "collapse": {
       "string": "Collapse",
       "developer_comment": "This is the text for an action, for example, the text of a button."
+    },
+    "selectRow": {
+      "string": "Select row",
+      "developer_comment": "This is the text for an action, for example, the text of a button."
     }
   },
   "field": {
@@ -907,6 +911,9 @@
     "loading": {
       "string": "Loading…"
     },
+    "map": {
+      "string": "Map"
+    },
     "no": {
       "string": "No"
     },
@@ -937,6 +944,9 @@
         "developer_comment": "This is the text of a navigation tab, which may also be shown as the page title (browser tab)."
       }
     },
+    "table": {
+      "string": "Table"
+    },
     "total": {
       "string": "Total"
     },
@@ -2123,6 +2133,14 @@
         "developer_comment": "This is shown for an update to an Entity when the update was made offline as part of a chain of updates."
       }
     },
+    "EntityFilters": {
+      "field": {
+        "creationDate": {
+          "string": "At",
+          "developer_comment": "This is the text of a form field that allows the user to filter Entities by a date range."
+        }
+      }
+    },
     "EntityFiltersConflict": {
       "conflict": {
         "true": {
@@ -2151,6 +2169,34 @@
         }
       }
     },
+    "EntityFiltersCreator": {
+      "field": {
+        "creator": {
+          "string": "Created by",
+          "developer_comment": "This is the text of a form field that shows the names of users that have created Entities."
+        },
+        "search": {
+          "string": "Search creators…",
+          "developer_comment": "This is the text of a form field."
+        }
+      },
+      "action": {
+        "all": {
+          "string": "All",
+          "developer_comment": "This is the text of the button in dropdown menu of entity \"created by\" filter, that allows the user to select all creators."
+        },
+        "none": {
+          "string": "None",
+          "developer_comment": "This is the text of the button in dropdown menu of creator filter, that allows the user to unselect all creators."
+        }
+      },
+      "unknown": {
+        "string": "Unknown creator"
+      },
+      "emptyTable": {
+        "string": "There are no Entities yet."
+      }
+    },
     "EntityList": {
       "noEntities": {
         "string": "There are no Entities to show.",
@@ -2168,6 +2214,12 @@
       "alert": {
         "delete": {
           "string": "Entity “{label}” has been deleted."
+        },
+        "bulkDelete": {
+          "string": "{count, plural, one {{count} Entity successfully deleted.} other {{count} Entities successfully deleted.}}"
+        },
+        "restored": {
+          "string": "{count, plural, one {{count} Entity successfully restored.} other {{count} Entities successfully restored.}}"
         }
       },
       "filterDisabledMessage": {
@@ -2190,6 +2242,11 @@
           "string": "All Entities on the page have been restored."
         }
       },
+      "actionBar": {
+        "message": {
+          "string": "{count, plural, one {{count} Entity selected} other {{count} Entities selected}}"
+        }
+      },
       "action": {
         "download": {
           "unfiltered": {
@@ -2198,11 +2255,11 @@
           },
           "filtered": {
             "withCount": {
-              "string": "{count, plural, one {Download {count} Entity matching the filter} other {Download {count} Entities matching the filter}}",
+              "string": "{count, plural, one {Download {count} matching Entity} other {Download {count} matching Entities}}",
               "developer_comment": "This is the text for an action, for example, the text of a button."
             },
             "withoutCount": {
-              "string": "Download all Entities matching the filter",
+              "string": "Download all matching Entities",
               "developer_comment": "This is the text of a button. This text is shown when the number of matching Entities is unknown."
             }
           }
@@ -3453,6 +3510,14 @@
         "enketoDefault": {
           "string": "Enketo (default)",
           "developer_comment": "The word \"Enketo\" should not be translated"
+        },
+        "enketoSelected": {
+          "string": "You’re now using Enketo to fill out, preview and edit your “{formName}” form.",
+          "developer_comment": "Success message when Enketo is selected as web form technology. {formName} is replaced with the name of the Form"
+        },
+        "owfSelected": {
+          "string": "You’re now using ODK Web Forms to fill out, preview and edit your “{formName}” form.",
+          "developer_comment": "Success message when ODK Web Forms is selected as web form technology. {formName} is replaced with the name of the Form"
         }
       }
     },
@@ -4829,7 +4894,7 @@
       },
       "allSubmissionDateSelected": {
         "string": "All time",
-        "developer_comment": "Text shown when in Submission date filter when Submissions for all dates are shown"
+        "developer_comment": "Text shown when in date filter when records for all dates are shown"
       }
     },
     "SubmissionFiltersReviewState": {
@@ -4895,6 +4960,9 @@
       "filterDisabledMessage": {
         "string": "Filtering is unavailable for deleted Submissions"
       },
+      "noMapEncryption": {
+        "string": "Map is unavailable due to Form encryption"
+      },
       "deletedSubmission": {
         "emptyTable": {
           "string": "There are no deleted Submissions."