From d0b15bdd8b8b6c6483d92ad28fa2d05582367779 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Wed, 11 Feb 2026 10:38:14 +0000
Subject: [PATCH 01/20] initial design to show box at top of provision page, go
 to attached planning group to see data

---
 src/middleware/common.middleware.js           | 31 +++++++++++++++++++
 src/middleware/datasetOverview.middleware.js  | 26 ++++++++++++++--
 src/routes/schemas.js                         |  6 ++++
 src/services/platformApi.js                   | 10 +++---
 .../includes/_planning-group-notice.html      | 17 ++++++++++
 src/views/organisations/dataset-overview.html |  2 ++
 6 files changed, 86 insertions(+), 6 deletions(-)
 create mode 100644 src/views/includes/_planning-group-notice.html

diff --git a/src/middleware/common.middleware.js b/src/middleware/common.middleware.js
index 44eb02ab5..dfd1126ca 100644
--- a/src/middleware/common.middleware.js
+++ b/src/middleware/common.middleware.js
@@ -1180,3 +1180,34 @@ export const fetchEntityIssueCountsPerformanceDb = fetchMany({
   result: 'entityIssueCounts',
   dataset: FetchOptions.performanceDb
 })
+
+/**
+ * Middleware, query platformApi for all local planning groups
+ * look if a given org code is within any local planning groups 'organisations' column
+ * return list of local planning group(s) the org belongs to in req.localPlanningGroups / null if none
+ * @param {Object} req request object
+ * @param {Object} req.orgInfo organisation info
+ * @param {string} req.orgInfo.organisation organisation code e.g. 'local-authority:BOL'
+ * @param {Object[]|null} req.localPlanningGroups OUT - list of local planning groups the org belongs to
+ * @param {*} res
+ * @param {*} next
+ */
+export const fetchLocalPlanningGroups = async (req, res, next) => {
+  try {
+    const orgCode = req.orgInfo.organisation
+    const { formattedData: groups } = await platformApi.fetchEntities({ prefix: 'local-planning-group' })
+
+    const matches = groups.filter(group => {
+      const orgs = (group.organisations || '').split(';')
+      return orgs.includes(orgCode)
+    })
+
+    req.localPlanningGroups = matches.length > 0
+      ? matches.map(g => ({ entity: g['organisation-entity'], name: g.name, organisation: `${g.prefix}:${g.reference}` }))
+      : null
+  } catch (error) {
+    logger.warn({ message: `fetchLocalPlanningGroups(): ${error.message}`, type: types.App })
+    req.localPlanningGroups = null
+  }
+  next()
+}
diff --git a/src/middleware/datasetOverview.middleware.js b/src/middleware/datasetOverview.middleware.js
index c6c6de415..dd10d23cd 100644
--- a/src/middleware/datasetOverview.middleware.js
+++ b/src/middleware/datasetOverview.middleware.js
@@ -4,7 +4,7 @@
  * @description Middleware for dataset overview page (under /oranisations/:lpa/:dataset/overview)
  */
 
-import { fetchDatasetPlatformInfo, fetchEntityIssueCountsPerformanceDb, fetchOrgInfo, fetchResources, fetchSources, logPageError, processSpecificationMiddlewares, expectationFetcher, expectations, noop, processAuthoritativeMiddlewares } from './common.middleware.js'
+import { fetchDatasetPlatformInfo, fetchEntityIssueCountsPerformanceDb, fetchOrgInfo, fetchResources, fetchSources, logPageError, processSpecificationMiddlewares, expectationFetcher, expectations, noop, processAuthoritativeMiddlewares, fetchLocalPlanningGroups } from './common.middleware.js'
 import { fetchOne, fetchMany, onlyIf, renderTemplate, FetchOptions, FetchOneFallbackPolicy } from './middleware.builders.js'
 import { getDeadlineHistory, requiredDatasets } from '../utils/utils.js'
 import logger from '../utils/logger.js'
@@ -186,7 +186,7 @@ export const fetchEntityCount = fetchOne({
  * @param {Function} next - Express next middleware function
  */
 export const prepareDatasetOverviewTemplateParams = (req, res, next) => {
-  const { orgInfo, entityCount, sources, dataset, entityIssueCounts, notice, authority, alternateSources, uniqueDatasetFields, expectationOutOfBounds = [] } = req
+  const { orgInfo, entityCount, sources, dataset, entityIssueCounts, notice, authority, alternateSources, uniqueDatasetFields, expectationOutOfBounds = [], provisions = [] } = req
 
   let endpointErrorIssues = 0
   const endpoints = sources
@@ -231,6 +231,10 @@ export const prepareDatasetOverviewTemplateParams = (req, res, next) => {
     : ''
   const downloadUrl = config.downloadUrl + `/${encodeURIComponent(dataset.dataset)}.csv?organisation-entity=${encodeURIComponent(orgInfo.entity)}&quality=${encodeURIComponent(authority)}${fieldsParams ? '&' + fieldsParams : ''}`
 
+  const planningGroupProvisions = provisions.length > 1
+    ? provisions.filter(p => p.organisation !== req.params.lpa)
+    : []
+
   req.templateParams = {
     downloadUrl,
     authority,
@@ -239,6 +243,7 @@ export const prepareDatasetOverviewTemplateParams = (req, res, next) => {
     dataset,
     taskCount,
     alternateSources,
+    planningGroupProvisions: planningGroupProvisions.length > 0 ? planningGroupProvisions : undefined,
     stats: {
       numberOfRecords: entityCount.entity_count,
       endpoints
@@ -257,8 +262,25 @@ const getDatasetOverview = renderTemplate(
   }
 )
 
+// TODO: MOVE COMMON AND LPA???
+const fetchProvisionsByOrgsAndDatasets = fetchMany({
+  query: ({ params, req }) => {
+    const orgs = [params.lpa]
+    if (req.localPlanningGroups) {
+      orgs.push(...req.localPlanningGroups.map(g => g.organisation))
+    }
+    const inClause = orgs.map(o => `'${o}'`).join(', ')
+    return /* sql */ `select dataset, project, provision_reason, organisation
+       from provision where organisation IN (${inClause})
+       AND dataset = '${params.dataset}'`
+  },
+  result: 'provisions'
+})
+
 export default [
   fetchOrgInfo,
+  fetchLocalPlanningGroups,
+  fetchProvisionsByOrgsAndDatasets,
   fetchDatasetPlatformInfo,
   fetchColumnSummary,
   fetchResources,
diff --git a/src/routes/schemas.js b/src/routes/schemas.js
index 262bd9e4b..181dd6b05 100644
--- a/src/routes/schemas.js
+++ b/src/routes/schemas.js
@@ -182,6 +182,12 @@ export const OrgDatasetOverview = v.strictObject({
       }))
     }))
   }),
+  planningGroupProvisions: v.optional(v.array(v.strictObject({
+    organisation: NonEmptyString,
+    dataset: NonEmptyString,
+    project: v.nullable(v.string()),
+    provision_reason: v.nullable(v.string())
+  }))),
   notice: v.optional(DeadlineNoticeField)
 })
 
diff --git a/src/services/platformApi.js b/src/services/platformApi.js
index 429e751ef..2d89ef29c 100644
--- a/src/services/platformApi.js
+++ b/src/services/platformApi.js
@@ -12,8 +12,9 @@ export default {
    * Fetches entities from the Platform API /entity.json endpoint
    *
    * @param {Object} params - Query parameters
-   * @param {string} params.organisation_entity - The organisation entity ID
-   * @param {string} params.dataset - The dataset name
+   * @param {string} [params.organisation_entity] - The organisation entity ID
+   * @param {string} [params.dataset] - The dataset name
+   * @param {string} [params.prefix] - Entity prefix filter (e.g., 'local-planning-group')
    * @param {number} [params.limit] - Maximum number of results
    * @param {number} [params.offset] - Number of results to skip
    * @param {string} [params.quality] - The quality level (e.g., 'authoritative', 'some')
@@ -21,13 +22,14 @@ export default {
    * @throws {Error} If the query fails or there is an error communicating with the Platform API
    */
   fetchEntities: async (params) => {
-    if (!params.organisation_entity && !params.dataset) {
-      throw new Error('organisation_entity or dataset are required parameters')
+    if (!params.organisation_entity && !params.dataset && !params.prefix) {
+      throw new Error('organisation_entity, dataset, or prefix are required parameters')
     }
     const queryParams = new URLSearchParams()
 
     if (params.organisation_entity) queryParams.append('organisation_entity', params.organisation_entity)
     if (params.dataset) queryParams.append('dataset', params.dataset)
+    if (params.prefix) queryParams.append('prefix', params.prefix)
     if (params.limit) queryParams.append('limit', params.limit)
     if (params.offset) queryParams.append('offset', params.offset)
     if (params.quality) queryParams.append('quality', params.quality)
diff --git a/src/views/includes/_planning-group-notice.html b/src/views/includes/_planning-group-notice.html
new file mode 100644
index 000000000..739dc6df9
--- /dev/null
+++ b/src/views/includes/_planning-group-notice.html
@@ -0,0 +1,17 @@
+{% if planningGroupProvisions and planningGroupProvisions | length > 0 %}
+<div class="govuk-notification-banner" role="region" aria-labelledby="planning-group-notice-title" data-module="govuk-notification-banner">
+  <div class="govuk-notification-banner__header">
+    <h2 class="govuk-notification-banner__title" id="planning-group-notice-title">
+      Important
+    </h2>
+  </div>
+  <div class="govuk-notification-banner__content">
+    <p class="govuk-body">This organisation is also attached to a planning group which is also provisioned to provide this data:</p>
+    <ul class="govuk-list govuk-list--bullet">
+      {% for provision in planningGroupProvisions %}
+        <li>{{ provision.organisation }}</li>
+      {% endfor %}
+    </ul>
+  </div>
+</div>
+{% endif %}
diff --git a/src/views/organisations/dataset-overview.html b/src/views/organisations/dataset-overview.html
index f4af56cf4..0b0541dea 100644
--- a/src/views/organisations/dataset-overview.html
+++ b/src/views/organisations/dataset-overview.html
@@ -189,6 +189,8 @@
 
 {% block content %}
 
+{% include "includes/_planning-group-notice.html" %}
+
 <div class="govuk-grid-row">
     {% include "includes/_dataset-page-header.html" %}
 </div>

From eafbfe9ebed0a37fbe418bb4e4415c6e3cc6a595 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Tue, 10 Mar 2026 19:13:32 +0000
Subject: [PATCH 02/20] banners for parent group, and group members, org list
 update:

---
 src/middleware/common.middleware.js           | 49 ++++++++++++-------
 src/middleware/datasetOverview.middleware.js  | 20 +++++---
 src/middleware/lpa-overview.middleware.js     | 11 +++--
 src/middleware/organisations.middleware.js    |  1 +
 src/routes/schemas.js                         | 17 ++++++-
 src/services/platformApi.js                   |  5 +-
 .../includes/_planning-group-notice.html      |  2 +-
 src/views/organisations/overview.html         | 32 ++++++++++++
 8 files changed, 104 insertions(+), 33 deletions(-)

diff --git a/src/middleware/common.middleware.js b/src/middleware/common.middleware.js
index e05e07586..84f4adf37 100644
--- a/src/middleware/common.middleware.js
+++ b/src/middleware/common.middleware.js
@@ -1180,32 +1180,45 @@ export const fetchEntityIssueCountsPerformanceDb = fetchMany({
 })
 
 /**
- * Middleware, query platformApi for all local planning groups
- * look if a given org code is within any local planning groups 'organisations' column
- * return list of local planning group(s) the org belongs to in req.localPlanningGroups / null if none
- * @param {Object} req request object
- * @param {Object} req.orgInfo organisation info
- * @param {string} req.orgInfo.organisation organisation code e.g. 'local-authority:BOL'
- * @param {Object[]|null} req.localPlanningGroups OUT - list of local planning groups the org belongs to
- * @param {*} res
- * @param {*} next
+ * Middleware. Fetches all local-planning-group entities from the Platform API in a single call and derives two outputs:
+ *
+ * - req.parentGroup {Object[]|null} - If this org is a member of any planning group(s), returns an array of those
+ *   groups with { entity, name, organisation }. Null if this org belongs to no planning groups.
+ *
+ * - req.planningGroupMembers {Object[]|null} - If this org IS a planning group, returns an array of its member
+ *   organisations with { organisation, name }, where name is resolved via a parallel Platform API lookup.
+ *   Falls back to the org code as name if the lookup fails. Null if this org is not a planning group.
  */
 export const fetchLocalPlanningGroups = async (req, res, next) => {
   try {
-    const orgCode = req.orgInfo.organisation
     const { formattedData: groups } = await platformApi.fetchEntities({ prefix: 'local-planning-group' })
+    const orgCode = req.orgInfo.organisation
 
-    const matches = groups.filter(group => {
-      const orgs = (group.organisations || '').split(';')
-      return orgs.includes(orgCode)
-    })
-
-    req.localPlanningGroups = matches.length > 0
-      ? matches.map(g => ({ entity: g['organisation-entity'], name: g.name, organisation: `${g.prefix}:${g.reference}` }))
+    const parentMatches = groups.filter(g => (g.organisations || '').split(';').includes(orgCode))
+    req.parentGroup = parentMatches.length > 0
+      ? parentMatches.map(g => ({ entity: g['organisation-entity'], name: g.name, organisation: `${g.prefix}:${g.reference}` }))
       : null
+
+    const ownGroup = groups.find(g => String(g['organisation-entity']) === String(req.orgInfo.entity))
+    if (ownGroup) {
+      const orgCodes = (ownGroup.organisations || '').split(';').filter(Boolean)
+      const resolved = await Promise.all(orgCodes.map(async (organisation) => {
+        try {
+          const { formattedData: entities } = await platformApi.fetchEntities({ organisation })
+          const name = entities[0]?.name ?? organisation
+          return { organisation, name }
+        } catch {
+          return { organisation, name: organisation }
+        }
+      }))
+      req.planningGroupMembers = resolved
+    } else {
+      req.planningGroupMembers = null
+    }
   } catch (error) {
     logger.warn({ message: `fetchLocalPlanningGroups(): ${error.message}`, type: types.App })
-    req.localPlanningGroups = null
+    req.parentGroup = null
+    req.planningGroupMembers = null
   }
   next()
 }
diff --git a/src/middleware/datasetOverview.middleware.js b/src/middleware/datasetOverview.middleware.js
index dd10d23cd..71299fdb6 100644
--- a/src/middleware/datasetOverview.middleware.js
+++ b/src/middleware/datasetOverview.middleware.js
@@ -186,7 +186,7 @@ export const fetchEntityCount = fetchOne({
  * @param {Function} next - Express next middleware function
  */
 export const prepareDatasetOverviewTemplateParams = (req, res, next) => {
-  const { orgInfo, entityCount, sources, dataset, entityIssueCounts, notice, authority, alternateSources, uniqueDatasetFields, expectationOutOfBounds = [], provisions = [] } = req
+  const { orgInfo, entityCount, sources, dataset, entityIssueCounts, notice, authority, alternateSources, uniqueDatasetFields, expectationOutOfBounds = [], provisions = [], parentGroup } = req
 
   let endpointErrorIssues = 0
   const endpoints = sources
@@ -244,6 +244,7 @@ export const prepareDatasetOverviewTemplateParams = (req, res, next) => {
     taskCount,
     alternateSources,
     planningGroupProvisions: planningGroupProvisions.length > 0 ? planningGroupProvisions : undefined,
+    parentGroup,
     stats: {
       numberOfRecords: entityCount.entity_count,
       endpoints
@@ -262,17 +263,22 @@ const getDatasetOverview = renderTemplate(
   }
 )
 
-// TODO: MOVE COMMON AND LPA???
+/* TODO: MOVE COMMON AND LPA???
+* Loooks to see if local planning authorities are also provisioned against the same dataset
+* surfaces that information on the dataset overview page.
+*/
 const fetchProvisionsByOrgsAndDatasets = fetchMany({
   query: ({ params, req }) => {
     const orgs = [params.lpa]
-    if (req.localPlanningGroups) {
-      orgs.push(...req.localPlanningGroups.map(g => g.organisation))
+    if (req.parentGroup) {
+      orgs.push(...req.parentGroup.map(g => g.organisation))
     }
     const inClause = orgs.map(o => `'${o}'`).join(', ')
-    return /* sql */ `select dataset, project, provision_reason, organisation
-       from provision where organisation IN (${inClause})
-       AND dataset = '${params.dataset}'`
+    return /* sql */ `select p.dataset, p.project, p.provision_reason, p.organisation, o.name
+       from provision p
+       left join organisation o on o.organisation = p.organisation
+       where p.organisation IN (${inClause})
+       AND p.dataset = '${params.dataset}'`
   },
   result: 'provisions'
 })
diff --git a/src/middleware/lpa-overview.middleware.js b/src/middleware/lpa-overview.middleware.js
index 922e13e91..43842e1f0 100644
--- a/src/middleware/lpa-overview.middleware.js
+++ b/src/middleware/lpa-overview.middleware.js
@@ -4,7 +4,7 @@
  * @description Middleware for oragnisation (LPA) overview page
  */
 
-import { expectationFetcher, expectations, fetchEndpointSummary, fetchOrgInfo, logPageError, noop, setAvailableDatasets, fetchEntityIssueCountsPerformanceDb } from './common.middleware.js'
+import { expectationFetcher, expectations, fetchEndpointSummary, fetchOrgInfo, logPageError, noop, setAvailableDatasets, fetchEntityIssueCountsPerformanceDb, fetchLocalPlanningGroups } from './common.middleware.js'
 import { fetchMany, renderTemplate, parallel } from './middleware.builders.js'
 import { getDeadlineHistory, requiredDatasets } from '../utils/utils.js'
 import _ from 'lodash'
@@ -246,7 +246,7 @@ export function prepareDatasetObjects (req, res, next) {
  * @returns {void}
  */
 export function prepareOverviewTemplateParams (req, res, next) {
-  const { orgInfo: organisation, provisions, datasets, availableDatasets } = req
+  const { orgInfo: organisation, provisions, datasets, availableDatasets, parentGroup, planningGroupMembers } = req
 
   const provisionData = new Map()
   for (const provision of provisions ?? []) {
@@ -268,7 +268,6 @@ export function prepareOverviewTemplateParams (req, res, next) {
   })
 
   const isODPMember = provisions.findIndex((p) => p.project === 'open-digital-planning') >= 0
-  const totalDatasets = datasets.length
   const [datasetsWithEndpoints, datasetsWithIssues, datasetsWithErrors] = datasets.reduce(orgStatsReducer, [0, 0, 0])
   const datasetsByReason = _.groupBy(datasets, (ds) => {
     const reason = provisionData.get(ds.dataset)?.provision_reason
@@ -285,6 +284,7 @@ export function prepareOverviewTemplateParams (req, res, next) {
         return 'other'
     }
   })
+  const totalDatasets = (datasetsByReason.statutory?.length ?? 0) + (datasetsByReason.expected?.length ?? 0) + (datasetsByReason.prospective?.length ?? 0)
 
   for (const coll of Object.values(datasetsByReason)) {
     coll.sort((a, b) => a.dataset.localeCompare(b.dataset))
@@ -297,7 +297,9 @@ export function prepareOverviewTemplateParams (req, res, next) {
     datasetsWithEndpoints,
     datasetsWithIssues,
     datasetsWithErrors,
-    isODPMember
+    isODPMember,
+    parentGroup,
+    planningGroupMembers
   }
 
   next()
@@ -453,6 +455,7 @@ const fetchOutOfBoundsExpectations = expectationFetcher({
 export default [
   fetchOrgInfo,
   parallel([
+    fetchLocalPlanningGroups,
     fetchEndpointSummary,
     fetchEntityIssueCountsPerformanceDb,
     fetchProvisions
diff --git a/src/middleware/organisations.middleware.js b/src/middleware/organisations.middleware.js
index 0d21ec356..413a72d63 100644
--- a/src/middleware/organisations.middleware.js
+++ b/src/middleware/organisations.middleware.js
@@ -17,6 +17,7 @@ const fetchOrganisations = fetchMany({
         p.organisation LIKE 'local-authority:%'
         OR p.organisation LIKE 'national-park-authority:%'
         OR p.organisation LIKE 'development-corporation:%'
+        OR p.organisation LIKE 'local-planning-group:%'
       )
       AND (
         p.end_date IS NULL
diff --git a/src/routes/schemas.js b/src/routes/schemas.js
index 181dd6b05..12c80353d 100644
--- a/src/routes/schemas.js
+++ b/src/routes/schemas.js
@@ -145,7 +145,16 @@ export const OrgOverviewPage = v.strictObject({
   datasetsWithEndpoints: v.integer(),
   datasetsWithIssues: v.integer(),
   datasetsWithErrors: v.integer(),
-  isODPMember: v.boolean()
+  isODPMember: v.boolean(),
+  parentGroup: v.optional(v.nullable(v.array(v.strictObject({
+    entity: NonEmptyString,
+    name: NonEmptyString,
+    organisation: NonEmptyString
+  })))),
+  planningGroupMembers: v.optional(v.nullable(v.array(v.strictObject({
+    organisation: NonEmptyString,
+    name: NonEmptyString
+  }))))
 })
 
 export const OrgFindPage = v.strictObject({
@@ -184,10 +193,16 @@ export const OrgDatasetOverview = v.strictObject({
   }),
   planningGroupProvisions: v.optional(v.array(v.strictObject({
     organisation: NonEmptyString,
+    name: v.nullable(v.string()),
     dataset: NonEmptyString,
     project: v.nullable(v.string()),
     provision_reason: v.nullable(v.string())
   }))),
+  parentGroup: v.optional(v.nullable(v.array(v.strictObject({
+    entity: NonEmptyString,
+    name: NonEmptyString,
+    organisation: NonEmptyString
+  })))),
   notice: v.optional(DeadlineNoticeField)
 })
 
diff --git a/src/services/platformApi.js b/src/services/platformApi.js
index 2d89ef29c..c8b83f5d2 100644
--- a/src/services/platformApi.js
+++ b/src/services/platformApi.js
@@ -22,14 +22,15 @@ export default {
    * @throws {Error} If the query fails or there is an error communicating with the Platform API
    */
   fetchEntities: async (params) => {
-    if (!params.organisation_entity && !params.dataset && !params.prefix) {
-      throw new Error('organisation_entity, dataset, or prefix are required parameters')
+    if (!params.organisation_entity && !params.dataset && !params.prefix && !params.organisation) {
+      throw new Error('organisation_entity, dataset, prefix, or organisation are required parameters')
     }
     const queryParams = new URLSearchParams()
 
     if (params.organisation_entity) queryParams.append('organisation_entity', params.organisation_entity)
     if (params.dataset) queryParams.append('dataset', params.dataset)
     if (params.prefix) queryParams.append('prefix', params.prefix)
+    if (params.organisation) queryParams.append('organisation', params.organisation)
     if (params.limit) queryParams.append('limit', params.limit)
     if (params.offset) queryParams.append('offset', params.offset)
     if (params.quality) queryParams.append('quality', params.quality)
diff --git a/src/views/includes/_planning-group-notice.html b/src/views/includes/_planning-group-notice.html
index 739dc6df9..d4ae42027 100644
--- a/src/views/includes/_planning-group-notice.html
+++ b/src/views/includes/_planning-group-notice.html
@@ -9,7 +9,7 @@ <h2 class="govuk-notification-banner__title" id="planning-group-notice-title">
     <p class="govuk-body">This organisation is also attached to a planning group which is also provisioned to provide this data:</p>
     <ul class="govuk-list govuk-list--bullet">
       {% for provision in planningGroupProvisions %}
-        <li>{{ provision.organisation }}</li>
+        <li><a class="govuk-link" href="/organisations/{{ provision.organisation }}">{{ provision.name or provision.organisation }}</a></li>
       {% endfor %}
     </ul>
   </div>
diff --git a/src/views/organisations/overview.html b/src/views/organisations/overview.html
index b4e5b4cd7..08f3ce593 100644
--- a/src/views/organisations/overview.html
+++ b/src/views/organisations/overview.html
@@ -133,6 +133,36 @@ <h1 class="govuk-heading-xl">
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
+  {% if planningGroupMembers %}
+  <div class="govuk-notification-banner" role="region" aria-labelledby="planning-group-members-title" data-module="govuk-notification-banner">
+    <div class="govuk-notification-banner__header">
+      <h2 class="govuk-notification-banner__title" id="planning-group-members-title">Important</h2>
+    </div>
+    <div class="govuk-notification-banner__content">
+      <p class="govuk-body">This joint planning group is formed up from these {{ "organisation" | pluralise(planningGroupMembers | length) }}:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        {% for member in planningGroupMembers %}
+          <li><a class="govuk-link" href="/organisations/{{ member.organisation }}">{{ member.name }}</a></li>
+        {% endfor %}
+      </ul>
+    </div>
+  </div>
+  {% endif %}
+  {% if parentGroup %}
+  <div class="govuk-notification-banner" role="region" aria-labelledby="planning-group-notice-title" data-module="govuk-notification-banner">
+    <div class="govuk-notification-banner__header">
+      <h2 class="govuk-notification-banner__title" id="planning-group-notice-title">Important</h2>
+    </div>
+    <div class="govuk-notification-banner__content">
+      <p class="govuk-body">This organisation is also attached to these joint planning {{ "group" | pluralise(parentGroup | length) }}:</p>
+      <ul class="govuk-list govuk-list--bullet">
+        {% for group in parentGroup %}
+          <li><a class="govuk-link" href="/organisations/{{ group.organisation }}">{{ group.name }}</a></li>
+        {% endfor %}
+      </ul>
+    </div>
+  </div>
+  {% endif %}
 
   {% if datasets.statutory.length > 0 %}
     <div data-testid="datasetsMandatory">
@@ -170,6 +200,8 @@ <h2 class="govuk-heading-m">Datasets {{ organisation.name}} can provide</h2>
     </div>
   {% endif %}
 
+  
+
   </div>
 </div>
 

From 4bd42f08d0eb67eb73836e926ea0d46e67179260 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Tue, 10 Mar 2026 19:49:36 +0000
Subject: [PATCH 03/20] pagination for entity platform

---
 src/middleware/common.middleware.js |  2 +-
 src/services/platformApi.js         | 27 +++++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/middleware/common.middleware.js b/src/middleware/common.middleware.js
index 84f4adf37..2957e4969 100644
--- a/src/middleware/common.middleware.js
+++ b/src/middleware/common.middleware.js
@@ -1191,7 +1191,7 @@ export const fetchEntityIssueCountsPerformanceDb = fetchMany({
  */
 export const fetchLocalPlanningGroups = async (req, res, next) => {
   try {
-    const { formattedData: groups } = await platformApi.fetchEntities({ prefix: 'local-planning-group' })
+    const { formattedData: groups } = await platformApi.fetchAllEntities({ prefix: 'local-planning-group' })
     const orgCode = req.orgInfo.organisation
 
     const parentMatches = groups.filter(g => (g.organisations || '').split(';').includes(orgCode))
diff --git a/src/services/platformApi.js b/src/services/platformApi.js
index c8b83f5d2..a84cd9eea 100644
--- a/src/services/platformApi.js
+++ b/src/services/platformApi.js
@@ -56,6 +56,33 @@ export default {
    * @returns {Promise<{data: object, formattedData: object[]}>} - A promise that resolves to formatted dataset data
    * @throws {Error} If the query fails or there is an error communicating with the Platform API
    */
+  /**
+   * Fetches all entities from the Platform API /entity.json endpoint, paginating through all results.
+   * Accepts the same params as fetchEntities (except limit/offset which are managed internally).
+   */
+  fetchAllEntities: async (params) => {
+    const pageSize = 100
+    let offset = 0
+    let allEntities = []
+
+    while (true) {
+      const queryParams = new URLSearchParams()
+      if (params.organisation_entity) queryParams.append('organisation_entity', params.organisation_entity)
+      if (params.dataset) queryParams.append('dataset', params.dataset)
+      if (params.prefix) queryParams.append('prefix', params.prefix)
+      if (params.organisation) queryParams.append('organisation', params.organisation)
+      queryParams.append('limit', pageSize)
+      queryParams.append('offset', offset)
+      const data = await queryPlatformAPI(`${config.mainWebsiteUrl}/entity.json?${queryParams.toString()}`, params)
+      const entities = data?.entities || []
+      allEntities = allEntities.concat(entities)
+      if (!data?.links?.next || entities.length < pageSize) break
+      offset += pageSize
+    }
+
+    return { formattedData: allEntities }
+  },
+
   fetchDatasets: async (params) => {
     const queryParams = new URLSearchParams()
 

From 53b281af3d36cad9599dd78b634a8f22f2e371fe Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Wed, 11 Mar 2026 14:14:24 +0000
Subject: [PATCH 04/20] design changes for lpa with members, organisations
 breakdown, bugs in names

---
 src/assets/scss/index.scss                    |  2 +-
 src/middleware/common.middleware.js           | 29 ++++----
 src/middleware/datasetOverview.middleware.js  |  6 +-
 src/middleware/organisations.middleware.js    | 13 ++--
 src/routes/schemas.js                         |  4 +-
 src/services/platformApi.js                   | 20 +++++
 .../includes/_planning-group-notice.html      |  2 +-
 src/views/organisations/dataset-overview.html |  4 +-
 src/views/organisations/find.html             | 37 +++++-----
 src/views/organisations/overview.html         | 74 ++++++++++---------
 10 files changed, 112 insertions(+), 79 deletions(-)

diff --git a/src/assets/scss/index.scss b/src/assets/scss/index.scss
index 71c196ccc..58ee8e60e 100644
--- a/src/assets/scss/index.scss
+++ b/src/assets/scss/index.scss
@@ -93,7 +93,7 @@ $govuk-global-styles: true;
 }
 
 .big-number {
-  @include govuk-font($size: 80, $weight: bold);
+  @include govuk-font($size: 48, $weight: bold);
   display: block;
 }
 
diff --git a/src/middleware/common.middleware.js b/src/middleware/common.middleware.js
index 2957e4969..66ac018c8 100644
--- a/src/middleware/common.middleware.js
+++ b/src/middleware/common.middleware.js
@@ -110,7 +110,7 @@ export const takeResourceIdFromParams = (req) => {
 
 export const fetchOrgInfo = fetchOne({
   query: ({ params }) => {
-    return `SELECT name, organisation, entity, statistical_geography FROM organisation WHERE organisation = '${params.lpa}'`
+    return `SELECT name, organisation, entity, statistical_geography, dataset FROM organisation WHERE organisation = '${params.lpa}'`
   },
   result: 'orgInfo'
 })
@@ -212,8 +212,8 @@ export const prepareAuthority = async (req, res, next) => {
       return next()
     }
 
-    // Second query: Check for 'some' quality
-    const someResult = await platformApi.fetchEntities({
+    // Second query: Check for 'some' quality, need all, if stroing alternateEntityList
+    const someResult = await platformApi.fetchAllEntities({
       organisation_entity: orgInfo.entity,
       dataset: params.dataset,
       quality: 'some'
@@ -1191,27 +1191,30 @@ export const fetchEntityIssueCountsPerformanceDb = fetchMany({
  */
 export const fetchLocalPlanningGroups = async (req, res, next) => {
   try {
-    const { formattedData: groups } = await platformApi.fetchAllEntities({ prefix: 'local-planning-group' })
+    const { formattedData: allGroups } = await platformApi.fetchAllEntities({ prefix: 'local-planning-group' })
+    // Remove all end-dated planning groups
+    const today = new Date().toISOString().slice(0, 10)
+    const groups = allGroups.filter(g => !g['end-date'] || g['end-date'] > today)
     const orgCode = req.orgInfo.organisation
 
+    // Find any groups this org is within the organisations field.
     const parentMatches = groups.filter(g => (g.organisations || '').split(';').includes(orgCode))
     req.parentGroup = parentMatches.length > 0
       ? parentMatches.map(g => ({ entity: g['organisation-entity'], name: g.name, organisation: `${g.prefix}:${g.reference}` }))
       : null
 
+    // Look to see if this org is a local-planning group
     const ownGroup = groups.find(g => String(g['organisation-entity']) === String(req.orgInfo.entity))
+
+    // if group get all members, and resolve their names in a single call to the Platform API, then map back to the org codes
     if (ownGroup) {
       const orgCodes = (ownGroup.organisations || '').split(';').filter(Boolean)
-      const resolved = await Promise.all(orgCodes.map(async (organisation) => {
-        try {
-          const { formattedData: entities } = await platformApi.fetchEntities({ organisation })
-          const name = entities[0]?.name ?? organisation
-          return { organisation, name }
-        } catch {
-          return { organisation, name: organisation }
-        }
+      const { flat: allOrgs } = await platformApi.fetchOrganisations()
+      const nameMap = new Map(allOrgs.map(o => [o.organisation, o.name]))
+      req.planningGroupMembers = orgCodes.map(organisation => ({
+        organisation,
+        name: nameMap.get(organisation) ?? organisation
       }))
-      req.planningGroupMembers = resolved
     } else {
       req.planningGroupMembers = null
     }
diff --git a/src/middleware/datasetOverview.middleware.js b/src/middleware/datasetOverview.middleware.js
index 71299fdb6..a39da5389 100644
--- a/src/middleware/datasetOverview.middleware.js
+++ b/src/middleware/datasetOverview.middleware.js
@@ -263,9 +263,9 @@ const getDatasetOverview = renderTemplate(
   }
 )
 
-/* TODO: MOVE COMMON AND LPA???
-* Loooks to see if local planning authorities are also provisioned against the same dataset
-* surfaces that information on the dataset overview page.
+/*
+* Loooks to see if any local planning authorities are also provisioned against the same dataset
+* surfaces that information on the dataset overview page as an Notice Banner
 */
 const fetchProvisionsByOrgsAndDatasets = fetchMany({
   query: ({ params, req }) => {
diff --git a/src/middleware/organisations.middleware.js b/src/middleware/organisations.middleware.js
index 413a72d63..c6977c949 100644
--- a/src/middleware/organisations.middleware.js
+++ b/src/middleware/organisations.middleware.js
@@ -8,7 +8,8 @@ const fetchOrganisations = fetchMany({
   query: ({ req, params }) => `
     SELECT DISTINCT
       p.organisation,
-      o.name
+      o.name,
+      o.dataset
     FROM
       provision p
       LEFT JOIN organisation o ON p.organisation = o.organisation
@@ -70,14 +71,16 @@ export const prepareGetOrganisationsTemplateParams = (req, res, next) => {
     return a.name.localeCompare(b.name)
   })
 
-  const alphabetisedOrgs = sortedResults.reduce((acc, current) => {
+  const datasetAlphabetisedOrgs = sortedResults.reduce((acc, current) => {
+    const datasetKey = current.dataset || 'other'
+    if (!acc[datasetKey]) acc[datasetKey] = {}
     const firstLetter = current.name.charAt(0).toUpperCase()
-    acc[firstLetter] = acc[firstLetter] || []
-    acc[firstLetter].push(current)
+    acc[datasetKey][firstLetter] = acc[datasetKey][firstLetter] || []
+    acc[datasetKey][firstLetter].push(current)
     return acc
   }, {})
 
-  req.templateParams = { alphabetisedOrgs }
+  req.templateParams = { datasetAlphabetisedOrgs }
 
   next()
 }
diff --git a/src/routes/schemas.js b/src/routes/schemas.js
index 12c80353d..11b5e8130 100644
--- a/src/routes/schemas.js
+++ b/src/routes/schemas.js
@@ -115,7 +115,7 @@ const IssueSpecification = v.optional(v.looseObject({
   guidance: v.optional(NonEmptyString)
 }))
 
-const OrgField = v.strictObject({ name: NonEmptyString, organisation: NonEmptyString, statistical_geography: v.optional(v.string()), entity: v.optional(v.integer()) })
+const OrgField = v.strictObject({ name: NonEmptyString, organisation: NonEmptyString, statistical_geography: v.optional(v.string()), entity: v.optional(v.integer()), dataset: v.optional(v.string()) })
 const DatasetNameField = v.looseObject({ name: NonEmptyString, dataset: NonEmptyString, collection: v.string() })
 const DatasetItem = v.strictObject({
   endpointCount: v.optional(v.number()),
@@ -158,7 +158,7 @@ export const OrgOverviewPage = v.strictObject({
 })
 
 export const OrgFindPage = v.strictObject({
-  alphabetisedOrgs: v.record(NonEmptyString, v.array(OrgField))
+  datasetAlphabetisedOrgs: v.record(NonEmptyString, v.record(NonEmptyString, v.array(OrgField)))
 })
 
 export const OrgGetStarted = v.strictObject({
diff --git a/src/services/platformApi.js b/src/services/platformApi.js
index a84cd9eea..d68f803b9 100644
--- a/src/services/platformApi.js
+++ b/src/services/platformApi.js
@@ -83,6 +83,26 @@ export default {
     return { formattedData: allEntities }
   },
 
+  /**
+   * Fetches organisations from /organisation.json.
+   *
+   * @param {Object} [params]
+   * @param {string} [params.organisations] - Optional dataset type to filter by (e.g. 'local-authority')
+   * @returns {Promise<{data: object, grouped: object, flat: object[]}>}
+   *   - data: raw response
+   *   - grouped: organisations keyed by dataset type
+   *   - flat: all organisations as a flat array across all types
+   */
+  fetchOrganisations: async (params = {}) => {
+    const queryParams = new URLSearchParams()
+    if (params.organisations) queryParams.append('organisations', params.organisations)
+    const url = `${config.mainWebsiteUrl}/organisation.json${queryParams.toString() ? '?' + queryParams.toString() : ''}`
+    const data = await queryPlatformAPI(url, params)
+    const grouped = data?.organisations || {}
+    const flat = Object.values(grouped).flat()
+    return { data, grouped, flat }
+  },
+
   fetchDatasets: async (params) => {
     const queryParams = new URLSearchParams()
 
diff --git a/src/views/includes/_planning-group-notice.html b/src/views/includes/_planning-group-notice.html
index d4ae42027..40023e26e 100644
--- a/src/views/includes/_planning-group-notice.html
+++ b/src/views/includes/_planning-group-notice.html
@@ -6,7 +6,7 @@ <h2 class="govuk-notification-banner__title" id="planning-group-notice-title">
     </h2>
   </div>
   <div class="govuk-notification-banner__content">
-    <p class="govuk-body">This organisation is also attached to a planning group which is also provisioned to provide this data:</p>
+    <p class="govuk-body">This organisation is attached to a planning group which is also provisioned to provide this data:</p>
     <ul class="govuk-list govuk-list--bullet">
       {% for provision in planningGroupProvisions %}
         <li><a class="govuk-link" href="/organisations/{{ provision.organisation }}">{{ provision.name or provision.organisation }}</a></li>
diff --git a/src/views/organisations/dataset-overview.html b/src/views/organisations/dataset-overview.html
index 0b0541dea..db44d5f9f 100644
--- a/src/views/organisations/dataset-overview.html
+++ b/src/views/organisations/dataset-overview.html
@@ -189,12 +189,12 @@
 
 {% block content %}
 
-{% include "includes/_planning-group-notice.html" %}
-
 <div class="govuk-grid-row">
     {% include "includes/_dataset-page-header.html" %}
 </div>
 
+{% include "includes/_planning-group-notice.html" %}
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
     {{ datasetNavigation({
diff --git a/src/views/organisations/find.html b/src/views/organisations/find.html
index 2a4637059..03f0345dc 100644
--- a/src/views/organisations/find.html
+++ b/src/views/organisations/find.html
@@ -46,24 +46,27 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">{{ pageName }}</h1>
   
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full" id="search_results">
-      {% for letter, orgs in alphabetisedOrgs %}
-        <div class="govuk-grid-row js-filter-item" data-filter="block">
-          <div class="govuk-grid-column-one-third">
-            <h2 class="blockHeading govuk-heading-xl">{{ letter }}</h2>
+      {% for datasetType, alphabetisedOrgs in datasetAlphabetisedOrgs %}
+        <h2 class="govuk-heading-l">{{ datasetType | datasetSlugToReadableName(true) }}</h2>
+        {% for letter, orgs in alphabetisedOrgs %}
+          <div class="govuk-grid-row js-filter-item" data-filter="block">
+            <div class="govuk-grid-column-one-third">
+              <h3 class="blockHeading govuk-heading-xl">{{ letter }}</h3>
+            </div>
+            <div class="govuk-grid-column-two-thirds" data-filter="inner-block">
+              <ul class="govuk-list govuk-!-margin-bottom-0">
+                {% for org in orgs %}
+                <li class="govuk-!-margin-bottom-1 js-filter-item" data-filter="item" data-filter-terms="{{org.name}}">
+                  <a href="/organisations/{{ org.organisation }}" class="govuk-link">{{ org.name }}</a>
+                </li>
+                {% endfor %}
+              </ul>
+            </div>
+            <div class="govuk-grid-column-full">
+              <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">
+            </div>
           </div>
-          <div class="govuk-grid-column-two-thirds" data-filter="inner-block">
-            <ul class="govuk-list govuk-!-margin-bottom-0">
-              {% for org in orgs %}
-              <li class="govuk-!-margin-bottom-1 js-filter-item" data-filter="item" data-filter-terms="{{org.name}}">
-                <a href="/organisations/{{ org.organisation }}" class="govuk-link">{{ org.name }}</a>
-              </li>
-              {% endfor %}
-            </ul>
-          </div>
-          <div class="govuk-grid-column-full">
-            <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">
-          </div>
-        </div>
+        {% endfor %}
       {% endfor %}
 
 
diff --git a/src/views/organisations/overview.html b/src/views/organisations/overview.html
index 08f3ce593..499da3e79 100644
--- a/src/views/organisations/overview.html
+++ b/src/views/organisations/overview.html
@@ -81,11 +81,16 @@ <h3 class="govuk-heading-m">
 {% block content %}
 
 <div class="govuk-grid-row">
-  <div class="govuk-grid-column-two-thirds">
+  <div class="govuk-grid-column-three-quarters">
+    {% if organisation.dataset %}
+      <span class="govuk-caption-xl">{{ organisation.dataset | datasetSlugToReadableName(true) }}</span>
+    {% endif %}
+    <h1 class="govuk-heading-l">{{ pageName }}</h1>
+  </div>
+</div>
 
-    <h1 class="govuk-heading-xl">
-      {{ pageName }}
-    </h1>
+<div class="govuk-grid-row">
+  <div class="govuk-grid-column-two-thirds">
 
     {% for dataset in datasets.statutory %}
       {% if dataset.notice %}
@@ -133,36 +138,6 @@ <h1 class="govuk-heading-xl">
 
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
-  {% if planningGroupMembers %}
-  <div class="govuk-notification-banner" role="region" aria-labelledby="planning-group-members-title" data-module="govuk-notification-banner">
-    <div class="govuk-notification-banner__header">
-      <h2 class="govuk-notification-banner__title" id="planning-group-members-title">Important</h2>
-    </div>
-    <div class="govuk-notification-banner__content">
-      <p class="govuk-body">This joint planning group is formed up from these {{ "organisation" | pluralise(planningGroupMembers | length) }}:</p>
-      <ul class="govuk-list govuk-list--bullet">
-        {% for member in planningGroupMembers %}
-          <li><a class="govuk-link" href="/organisations/{{ member.organisation }}">{{ member.name }}</a></li>
-        {% endfor %}
-      </ul>
-    </div>
-  </div>
-  {% endif %}
-  {% if parentGroup %}
-  <div class="govuk-notification-banner" role="region" aria-labelledby="planning-group-notice-title" data-module="govuk-notification-banner">
-    <div class="govuk-notification-banner__header">
-      <h2 class="govuk-notification-banner__title" id="planning-group-notice-title">Important</h2>
-    </div>
-    <div class="govuk-notification-banner__content">
-      <p class="govuk-body">This organisation is also attached to these joint planning {{ "group" | pluralise(parentGroup | length) }}:</p>
-      <ul class="govuk-list govuk-list--bullet">
-        {% for group in parentGroup %}
-          <li><a class="govuk-link" href="/organisations/{{ group.organisation }}">{{ group.name }}</a></li>
-        {% endfor %}
-      </ul>
-    </div>
-  </div>
-  {% endif %}
 
   {% if datasets.statutory.length > 0 %}
     <div data-testid="datasetsMandatory">
@@ -200,8 +175,37 @@ <h2 class="govuk-heading-m">Datasets {{ organisation.name}} can provide</h2>
     </div>
   {% endif %}
 
-  
+  </div>
 
+  <div class="govuk-grid-column-one-third">
+    {% if planningGroupMembers %}
+    <div class="govuk-notification-banner" role="region" aria-labelledby="planning-group-members-title" data-module="govuk-notification-banner">
+      <div class="govuk-notification-banner__header">
+        <h2 class="govuk-notification-banner__title" id="planning-group-members-title">Group {{ "Membership" | pluralise(planningGroupMembers | length) }}</h2>
+      </div>
+      <div class="govuk-notification-banner__content">
+        <ul class="govuk-list govuk-list--bullet">
+          {% for member in planningGroupMembers %}
+            <li><a class="govuk-link" href="/organisations/{{ member.organisation }}">{{ member.name }}</a></li>
+          {% endfor %}
+        </ul>
+      </div>
+    </div>
+    {% endif %}
+    {% if parentGroup %}
+    <div class="govuk-notification-banner" role="region" aria-labelledby="planning-group-notice-title" data-module="govuk-notification-banner">
+      <div class="govuk-notification-banner__header">
+        <h2 class="govuk-notification-banner__title" id="planning-group-notice-title">Membership of</h2>
+      </div>
+      <div class="govuk-notification-banner__content">
+        <ul class="govuk-list govuk-list--bullet">
+          {% for group in parentGroup %}
+            <li><a class="govuk-link" href="/organisations/{{ group.organisation }}">{{ group.name }}</a></li>
+          {% endfor %}
+        </ul>
+      </div>
+    </div>
+    {% endif %}
   </div>
 </div>
 

From c9c8b7dce370cc3fbe71a1055a893b3eb0dd2229 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Wed, 11 Mar 2026 16:19:57 +0000
Subject: [PATCH 05/20] apply banner to all, org list change

---
 src/middleware/common.middleware.js          | 27 +++++++++++++-
 src/middleware/datasetOverview.middleware.js | 22 +-----------
 src/middleware/datasetTaskList.middleware.js | 12 +++++--
 src/middleware/dataview.middleware.js        | 13 +++++--
 src/middleware/getStarted.middleware.js      | 16 +++++++--
 src/middleware/organisations.middleware.js   | 10 +++---
 src/routes/schemas.js                        | 26 ++++++++------
 src/views/organisations/datasetTaskList.html |  2 ++
 src/views/organisations/dataview.html        |  2 ++
 src/views/organisations/find.html            | 37 +++++++++-----------
 src/views/organisations/get-started.html     |  2 ++
 src/views/organisations/overview.html        |  4 +--
 12 files changed, 105 insertions(+), 68 deletions(-)

diff --git a/src/middleware/common.middleware.js b/src/middleware/common.middleware.js
index 66ac018c8..bddd087c8 100644
--- a/src/middleware/common.middleware.js
+++ b/src/middleware/common.middleware.js
@@ -1181,7 +1181,7 @@ export const fetchEntityIssueCountsPerformanceDb = fetchMany({
 
 /**
  * Middleware. Fetches all local-planning-group entities from the Platform API in a single call and derives two outputs:
- *
+ *. - takes org code and:
  * - req.parentGroup {Object[]|null} - If this org is a member of any planning group(s), returns an array of those
  *   groups with { entity, name, organisation }. Null if this org belongs to no planning groups.
  *
@@ -1225,3 +1225,28 @@ export const fetchLocalPlanningGroups = async (req, res, next) => {
   }
   next()
 }
+
+/**
+ * Fetches provision records for the current organisation and any planning groups it belongs to,
+ * filtered to the current dataset. Includes the organisation name via a JOIN on the organisation table.
+ *
+ * Requires: req.params.lpa, req.params.dataset, req.parentGroup (set by fetchLocalPlanningGroups)
+ * Sets: req.provisions — array of { dataset, project, provision_reason, organisation, name }
+ * 
+ * TODO: Does it need fetchMany any more, would allow an append of Org Name to fetchLocalPlanningGroups result
+ */
+export const fetchProvisionsByOrgsAndDatasets = fetchMany({
+  query: ({ params, req }) => {
+    const orgs = [params.lpa]
+    if (req.parentGroup) {
+      orgs.push(...req.parentGroup.map(g => g.organisation))
+    }
+    const inClause = orgs.map(o => `'${o}'`).join(', ')
+    return /* sql */ `select p.dataset, p.project, p.provision_reason, p.organisation, o.name
+       from provision p
+       left join organisation o on o.organisation = p.organisation
+       where p.organisation IN (${inClause})
+       AND p.dataset = '${params.dataset}'`
+  },
+  result: 'provisions'
+})
diff --git a/src/middleware/datasetOverview.middleware.js b/src/middleware/datasetOverview.middleware.js
index a39da5389..d9881cbb8 100644
--- a/src/middleware/datasetOverview.middleware.js
+++ b/src/middleware/datasetOverview.middleware.js
@@ -4,7 +4,7 @@
  * @description Middleware for dataset overview page (under /oranisations/:lpa/:dataset/overview)
  */
 
-import { fetchDatasetPlatformInfo, fetchEntityIssueCountsPerformanceDb, fetchOrgInfo, fetchResources, fetchSources, logPageError, processSpecificationMiddlewares, expectationFetcher, expectations, noop, processAuthoritativeMiddlewares, fetchLocalPlanningGroups } from './common.middleware.js'
+import { fetchDatasetPlatformInfo, fetchEntityIssueCountsPerformanceDb, fetchOrgInfo, fetchResources, fetchSources, logPageError, processSpecificationMiddlewares, expectationFetcher, expectations, noop, processAuthoritativeMiddlewares, fetchLocalPlanningGroups, fetchProvisionsByOrgsAndDatasets } from './common.middleware.js'
 import { fetchOne, fetchMany, onlyIf, renderTemplate, FetchOptions, FetchOneFallbackPolicy } from './middleware.builders.js'
 import { getDeadlineHistory, requiredDatasets } from '../utils/utils.js'
 import logger from '../utils/logger.js'
@@ -263,26 +263,6 @@ const getDatasetOverview = renderTemplate(
   }
 )
 
-/*
-* Loooks to see if any local planning authorities are also provisioned against the same dataset
-* surfaces that information on the dataset overview page as an Notice Banner
-*/
-const fetchProvisionsByOrgsAndDatasets = fetchMany({
-  query: ({ params, req }) => {
-    const orgs = [params.lpa]
-    if (req.parentGroup) {
-      orgs.push(...req.parentGroup.map(g => g.organisation))
-    }
-    const inClause = orgs.map(o => `'${o}'`).join(', ')
-    return /* sql */ `select p.dataset, p.project, p.provision_reason, p.organisation, o.name
-       from provision p
-       left join organisation o on o.organisation = p.organisation
-       where p.organisation IN (${inClause})
-       AND p.dataset = '${params.dataset}'`
-  },
-  result: 'provisions'
-})
-
 export default [
   fetchOrgInfo,
   fetchLocalPlanningGroups,
diff --git a/src/middleware/datasetTaskList.middleware.js b/src/middleware/datasetTaskList.middleware.js
index dcd2d9739..c0c05f629 100644
--- a/src/middleware/datasetTaskList.middleware.js
+++ b/src/middleware/datasetTaskList.middleware.js
@@ -21,6 +21,8 @@ import {
   fetchEntityCount,
   fetchEntityIssueCounts,
   fetchEntryIssueCounts,
+  fetchLocalPlanningGroups,
+  fetchProvisionsByOrgsAndDatasets,
   fetchOrgInfo, fetchResources, fetchSources,
   logPageError,
   noop,
@@ -206,13 +208,17 @@ export const prepareTasks = (req, res, next) => {
  * @param {*} next
  */
 export const prepareDatasetTaskListTemplateParams = (req, res, next) => {
-  const { taskList, dataset, orgInfo: organisation, authority } = req
+  const { taskList, dataset, orgInfo: organisation, authority, provisions } = req
+  const planningGroupProvisions = provisions?.length > 1
+    ? provisions.filter(p => p.organisation !== req.params.lpa)
+    : []
 
   req.templateParams = {
     taskList,
     organisation,
     authority,
-    dataset
+    dataset,
+    planningGroupProvisions: planningGroupProvisions.length > 0 ? planningGroupProvisions : undefined
   }
   next()
 }
@@ -226,6 +232,8 @@ const getDatasetTaskList = renderTemplate({
 export default [
   validateOrgAndDatasetQueryParams,
   fetchOrgInfo,
+  fetchLocalPlanningGroups,
+  fetchProvisionsByOrgsAndDatasets,
   fetchSources,
   fetchDatasetInfo,
   fetchResources,
diff --git a/src/middleware/dataview.middleware.js b/src/middleware/dataview.middleware.js
index cf63c434c..afb0d9c34 100644
--- a/src/middleware/dataview.middleware.js
+++ b/src/middleware/dataview.middleware.js
@@ -3,6 +3,8 @@ import {
   createPaginationTemplateParams,
   extractJsonFieldFromEntities,
   fetchDatasetInfo,
+  fetchLocalPlanningGroups,
+  fetchProvisionsByOrgsAndDatasets,
   fetchOrgInfo,
   processAuthoritativeMiddlewares,
   processSpecificationMiddlewares,
@@ -81,7 +83,7 @@ export const constructTableParams = (req, res, next) => {
 }
 
 export const prepareTemplateParams = (req, res, next) => {
-  const { orgInfo, dataset, tableParams, pagination, dataRange, entityIssueCounts, authority, alternateSources, uniqueDatasetFields } = req
+  const { orgInfo, dataset, tableParams, pagination, dataRange, entityIssueCounts, authority, alternateSources, uniqueDatasetFields, provisions } = req
 
   // Hard code task count for 'some' authority
   const taskCount = authority !== 'some' ? (entityIssueCounts ? entityIssueCounts.length : 0) : 1
@@ -91,6 +93,10 @@ export const prepareTemplateParams = (req, res, next) => {
     : ''
   const downloadUrl = config.downloadUrl + `/${encodeURIComponent(dataset.dataset)}.csv?organisation-entity=${encodeURIComponent(orgInfo.entity)}&quality=${encodeURIComponent(authority)}${fieldsParams ? '&' + fieldsParams : ''}`
 
+  const planningGroupProvisions = provisions?.length > 1
+    ? provisions.filter(p => p.organisation !== req.params.lpa)
+    : []
+
   req.templateParams = {
     downloadUrl,
     organisation: orgInfo,
@@ -100,7 +106,8 @@ export const prepareTemplateParams = (req, res, next) => {
     tableParams,
     pagination,
     dataRange,
-    alternateSources
+    alternateSources,
+    planningGroupProvisions: planningGroupProvisions.length > 0 ? planningGroupProvisions : undefined
   }
   next()
 }
@@ -117,6 +124,8 @@ export default [
 
   getSetBaseSubPath(['data']),
   fetchOrgInfo,
+  fetchLocalPlanningGroups,
+  fetchProvisionsByOrgsAndDatasets,
   fetchDatasetInfo,
 
   fetchResources,
diff --git a/src/middleware/getStarted.middleware.js b/src/middleware/getStarted.middleware.js
index 6cebe94da..3d9629e07 100644
--- a/src/middleware/getStarted.middleware.js
+++ b/src/middleware/getStarted.middleware.js
@@ -1,10 +1,18 @@
-import { fetchDatasetInfo, fetchOrgInfo, logPageError, prepareAuthority } from './common.middleware.js'
+import { fetchDatasetInfo, fetchLocalPlanningGroups, fetchProvisionsByOrgsAndDatasets, fetchOrgInfo, logPageError, prepareAuthority } from './common.middleware.js'
 import { renderTemplate } from './middleware.builders.js'
 
 export const getGetStarted = renderTemplate({
   templateParams (req) {
-    const { orgInfo: organisation, dataset, authority } = req
-    return { organisation, dataset, authority }
+    const { orgInfo: organisation, dataset, authority, provisions } = req
+    const planningGroupProvisions = provisions?.length > 1
+      ? provisions.filter(p => p.organisation !== req.params.lpa)
+      : []
+    return {
+      organisation,
+      dataset,
+      authority,
+      planningGroupProvisions: planningGroupProvisions.length > 0 ? planningGroupProvisions : undefined
+    }
   },
   template: 'organisations/get-started.html',
   handlerName: 'getStarted'
@@ -12,6 +20,8 @@ export const getGetStarted = renderTemplate({
 
 export default [
   fetchOrgInfo,
+  fetchLocalPlanningGroups,
+  fetchProvisionsByOrgsAndDatasets,
   fetchDatasetInfo,
   prepareAuthority,
   getGetStarted,
diff --git a/src/middleware/organisations.middleware.js b/src/middleware/organisations.middleware.js
index c6977c949..cb6ac83c4 100644
--- a/src/middleware/organisations.middleware.js
+++ b/src/middleware/organisations.middleware.js
@@ -71,16 +71,14 @@ export const prepareGetOrganisationsTemplateParams = (req, res, next) => {
     return a.name.localeCompare(b.name)
   })
 
-  const datasetAlphabetisedOrgs = sortedResults.reduce((acc, current) => {
+  const orgsByDataset = sortedResults.reduce((acc, current) => {
     const datasetKey = current.dataset || 'other'
-    if (!acc[datasetKey]) acc[datasetKey] = {}
-    const firstLetter = current.name.charAt(0).toUpperCase()
-    acc[datasetKey][firstLetter] = acc[datasetKey][firstLetter] || []
-    acc[datasetKey][firstLetter].push(current)
+    acc[datasetKey] = acc[datasetKey] || []
+    acc[datasetKey].push(current)
     return acc
   }, {})
 
-  req.templateParams = { datasetAlphabetisedOrgs }
+  req.templateParams = { orgsByDataset }
 
   next()
 }
diff --git a/src/routes/schemas.js b/src/routes/schemas.js
index 11b5e8130..2341151ae 100644
--- a/src/routes/schemas.js
+++ b/src/routes/schemas.js
@@ -117,6 +117,13 @@ const IssueSpecification = v.optional(v.looseObject({
 
 const OrgField = v.strictObject({ name: NonEmptyString, organisation: NonEmptyString, statistical_geography: v.optional(v.string()), entity: v.optional(v.integer()), dataset: v.optional(v.string()) })
 const DatasetNameField = v.looseObject({ name: NonEmptyString, dataset: NonEmptyString, collection: v.string() })
+const PlanningGroupProvisionsField = v.optional(v.array(v.strictObject({
+  organisation: NonEmptyString,
+  name: v.nullable(v.string()),
+  dataset: NonEmptyString,
+  project: v.nullable(v.string()),
+  provision_reason: v.nullable(v.string())
+})))
 const DatasetItem = v.strictObject({
   endpointCount: v.optional(v.number()),
   status: v.enum(datasetStatusEnum),
@@ -158,13 +165,14 @@ export const OrgOverviewPage = v.strictObject({
 })
 
 export const OrgFindPage = v.strictObject({
-  datasetAlphabetisedOrgs: v.record(NonEmptyString, v.record(NonEmptyString, v.array(OrgField)))
+  orgsByDataset: v.record(NonEmptyString, v.array(OrgField))
 })
 
 export const OrgGetStarted = v.strictObject({
   organisation: OrgField,
   dataset: DatasetNameField,
-  authority: v.string()
+  authority: v.string(),
+  planningGroupProvisions: PlanningGroupProvisionsField
 })
 
 export const OrgDatasetOverview = v.strictObject({
@@ -191,13 +199,7 @@ export const OrgDatasetOverview = v.strictObject({
       }))
     }))
   }),
-  planningGroupProvisions: v.optional(v.array(v.strictObject({
-    organisation: NonEmptyString,
-    name: v.nullable(v.string()),
-    dataset: NonEmptyString,
-    project: v.nullable(v.string()),
-    provision_reason: v.nullable(v.string())
-  }))),
+  planningGroupProvisions: PlanningGroupProvisionsField,
   parentGroup: v.optional(v.nullable(v.array(v.strictObject({
     entity: NonEmptyString,
     name: NonEmptyString,
@@ -215,7 +217,8 @@ export const OrgDataView = v.strictObject({
   tableParams,
   pagination: PaginationParams,
   dataRange: dataRangeParams,
-  alternateSources: v.optional(v.array(v.strictObject({ name: NonEmptyString })))
+  alternateSources: v.optional(v.array(v.strictObject({ name: NonEmptyString }))),
+  planningGroupProvisions: PlanningGroupProvisionsField
 })
 
 export const OrgDatasetTaskList = v.strictObject({
@@ -235,7 +238,8 @@ export const OrgDatasetTaskList = v.strictObject({
     dataset: NonEmptyString,
     name: NonEmptyString,
     collection: NonEmptyString
-  })
+  }),
+  planningGroupProvisions: PlanningGroupProvisionsField
 })
 
 export const OrgEndpointError = v.strictObject({
diff --git a/src/views/organisations/datasetTaskList.html b/src/views/organisations/datasetTaskList.html
index 0b927638c..87a8a937b 100644
--- a/src/views/organisations/datasetTaskList.html
+++ b/src/views/organisations/datasetTaskList.html
@@ -41,6 +41,8 @@
   {% include "includes/_dataset-page-header.html" %}
 </div>
 
+{% include "includes/_planning-group-notice.html" %}
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
     {{ datasetNavigation({
diff --git a/src/views/organisations/dataview.html b/src/views/organisations/dataview.html
index 881e9086a..8cb38a7a0 100644
--- a/src/views/organisations/dataview.html
+++ b/src/views/organisations/dataview.html
@@ -43,6 +43,8 @@
   {% include "includes/_dataset-page-header.html" %}
 </div>
 
+{% include "includes/_planning-group-notice.html" %}
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-full">
     {{ datasetNavigation({
diff --git a/src/views/organisations/find.html b/src/views/organisations/find.html
index 03f0345dc..4aadd2b89 100644
--- a/src/views/organisations/find.html
+++ b/src/views/organisations/find.html
@@ -46,27 +46,24 @@ <h1 class="govuk-heading-xl govuk-!-margin-bottom-5">{{ pageName }}</h1>
   
   <div class="govuk-grid-row">
     <div class="govuk-grid-column-full" id="search_results">
-      {% for datasetType, alphabetisedOrgs in datasetAlphabetisedOrgs %}
-        <h2 class="govuk-heading-l">{{ datasetType | datasetSlugToReadableName(true) }}</h2>
-        {% for letter, orgs in alphabetisedOrgs %}
-          <div class="govuk-grid-row js-filter-item" data-filter="block">
-            <div class="govuk-grid-column-one-third">
-              <h3 class="blockHeading govuk-heading-xl">{{ letter }}</h3>
-            </div>
-            <div class="govuk-grid-column-two-thirds" data-filter="inner-block">
-              <ul class="govuk-list govuk-!-margin-bottom-0">
-                {% for org in orgs %}
-                <li class="govuk-!-margin-bottom-1 js-filter-item" data-filter="item" data-filter-terms="{{org.name}}">
-                  <a href="/organisations/{{ org.organisation }}" class="govuk-link">{{ org.name }}</a>
-                </li>
-                {% endfor %}
-              </ul>
-            </div>
-            <div class="govuk-grid-column-full">
-              <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">
-            </div>
+      {% for datasetType, orgs in orgsByDataset %}
+        <div class="govuk-grid-row js-filter-item" data-filter="block">
+          <div class="govuk-grid-column-one-third">
+            <h2 class="blockHeading govuk-heading-m">{{ datasetType | datasetSlugToReadableName(true) }}</h2>
+            <span class="big-number">{{ orgs | length }}</span>
           </div>
-        {% endfor %}
+          <div class="govuk-grid-column-two-thirds" data-filter="inner-block">
+            {% for org in orgs %}
+              <div class="js-filter-item" data-filter="item" data-filter-terms="{{ org.name }}">
+                <a href="/organisations/{{ org.organisation }}" class="govuk-link govuk-!-display-block govuk-!-margin-bottom-2">{{ org.name }}</a>
+                <hr class="govuk-section-break govuk-section-break--visible govuk-!-margin-bottom-2">
+              </div>
+            {% endfor %}
+          </div>
+          <div class="govuk-grid-column-full">
+            <hr class="govuk-section-break govuk-section-break--l govuk-section-break--visible">
+          </div>
+        </div>
       {% endfor %}
 
 
diff --git a/src/views/organisations/get-started.html b/src/views/organisations/get-started.html
index a3702c96b..005d0392c 100644
--- a/src/views/organisations/get-started.html
+++ b/src/views/organisations/get-started.html
@@ -40,6 +40,8 @@
   {% include "includes/_dataset-page-header.html" %}
 </div>
 
+{% include "includes/_planning-group-notice.html" %}
+
 <div class="govuk-grid-row">
   <div class="govuk-grid-column-two-thirds">
     {% if authority and authority === "some" %}
diff --git a/src/views/organisations/overview.html b/src/views/organisations/overview.html
index 499da3e79..616f99f04 100644
--- a/src/views/organisations/overview.html
+++ b/src/views/organisations/overview.html
@@ -181,7 +181,7 @@ <h2 class="govuk-heading-m">Datasets {{ organisation.name}} can provide</h2>
     {% if planningGroupMembers %}
     <div class="govuk-notification-banner" role="region" aria-labelledby="planning-group-members-title" data-module="govuk-notification-banner">
       <div class="govuk-notification-banner__header">
-        <h2 class="govuk-notification-banner__title" id="planning-group-members-title">Group {{ "Membership" | pluralise(planningGroupMembers | length) }}</h2>
+        <h2 class="govuk-notification-banner__title" id="planning-group-members-title">Membership</h2>
       </div>
       <div class="govuk-notification-banner__content">
         <ul class="govuk-list govuk-list--bullet">
@@ -195,7 +195,7 @@ <h2 class="govuk-notification-banner__title" id="planning-group-members-title">G
     {% if parentGroup %}
     <div class="govuk-notification-banner" role="region" aria-labelledby="planning-group-notice-title" data-module="govuk-notification-banner">
       <div class="govuk-notification-banner__header">
-        <h2 class="govuk-notification-banner__title" id="planning-group-notice-title">Membership of</h2>
+        <h2 class="govuk-notification-banner__title" id="planning-group-notice-title">Group {{ "Membership" | pluralise(parentGroup | length) }}</h2>
       </div>
       <div class="govuk-notification-banner__content">
         <ul class="govuk-list govuk-list--bullet">

From 043f82436b2daade32837689dc0021a5caa49cb8 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Wed, 11 Mar 2026 16:25:57 +0000
Subject: [PATCH 06/20] lint

---
 src/middleware/common.middleware.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/middleware/common.middleware.js b/src/middleware/common.middleware.js
index bddd087c8..60c224b6a 100644
--- a/src/middleware/common.middleware.js
+++ b/src/middleware/common.middleware.js
@@ -1232,7 +1232,7 @@ export const fetchLocalPlanningGroups = async (req, res, next) => {
  *
  * Requires: req.params.lpa, req.params.dataset, req.parentGroup (set by fetchLocalPlanningGroups)
  * Sets: req.provisions — array of { dataset, project, provision_reason, organisation, name }
- * 
+ *
  * TODO: Does it need fetchMany any more, would allow an append of Org Name to fetchLocalPlanningGroups result
  */
 export const fetchProvisionsByOrgsAndDatasets = fetchMany({

From 4beb5dbe80f211d12acb29a69cbcff1e8bca49d0 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Thu, 19 Mar 2026 11:48:44 +0000
Subject: [PATCH 07/20] dataset-field to use dataset.dataset:

---
 src/middleware/common.middleware.js | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/middleware/common.middleware.js b/src/middleware/common.middleware.js
index 60c224b6a..d1caf5b07 100644
--- a/src/middleware/common.middleware.js
+++ b/src/middleware/common.middleware.js
@@ -377,7 +377,7 @@ export const fetchSpecification = fetchOne({
 // Fall back dataset fields if no specification found
 
 export const fetchDatasetFields = fetchMany({
-  query: ({ req }) => `select field from dataset_field where dataset = '${req.dataset.collection}'`,
+  query: ({ req }) => `select field from dataset_field where dataset = '${req.dataset.dataset}'`,
   result: 'datasetFields'
 })
 
@@ -473,6 +473,8 @@ export const getUniqueDatasetFieldsFromSpecification = (req, res, next) => {
 export const constructSpecificationTable = (req, res, next) => {
   const { datasetFields } = req
   // Filter out internal system fields that shouldn't be displayed
+  logger.info('No specification found, constructing specification from dataset fields', { dataset: req.dataset.dataset, datasetFields: datasetFields.map(df => df.field) })
+  logger.info('pulling from collection field dataset_field where dataset = dataset.collection, so using collection as lookup key for dataset fields table, not dataset name', { collection: req.dataset.collection })
   const systemFields = ['entity', 'prefix', 'entry-number', 'organisation-entity', 'organisation']
 
   req.specification = {
@@ -491,17 +493,32 @@ export const constructSpecificationTable = (req, res, next) => {
  * @function
  * @description Middleware chain to process the dataset specification and prepare it for the issue table, conditional execution on whether a specification exists
  */
+/** @param {string} step */
+const logSpecStep = (step) => (/** @type {any} */ req, /** @type {any} */ _res, /** @type {Function} */ next) => {
+  logger.debug({ message: `processSpecification: ${step}`, type: types.App, dataset: req.params?.dataset, collection: req.dataset?.collection, hasSpecification: !!req.specification })
+  next()
+}
+
 export const processSpecificationMiddlewares = [
+  logSpecStep('fetchSpecification'),
   fetchSpecification,
+  logSpecStep('pullOutDatasetSpecification'),
   pullOutDatasetSpecification,
   // When specification exists, use field mappings from transform table
+  logSpecStep('replaceUnderscoreInSpecification'),
   onlyIf(req => req.specification, replaceUnderscoreInSpecification),
+  logSpecStep('fetchFieldMappings'),
   onlyIf(req => req.specification, fetchFieldMappings),
+  logSpecStep('addDatabaseFieldToSpecification'),
   onlyIf(req => req.specification, addDatabaseFieldToSpecification),
+  logSpecStep('filterOutSystemFields'),
   onlyIf(req => req.specification, filterOutSystemFields),
   // When no specification exists, use fields from dataset_field table
+  logSpecStep('fetchDatasetFields'),
   onlyIf(req => !req.specification, fetchDatasetFields),
+  logSpecStep('constructSpecificationTable'),
   onlyIf(req => !req.specification, constructSpecificationTable),
+  logSpecStep('getUniqueDatasetFieldsFromSpecification'),
   getUniqueDatasetFieldsFromSpecification
 ]
 

From 39f9ca1359af0a7ddbbdef4e9dd65de591d2c631 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Thu, 19 Mar 2026 11:51:25 +0000
Subject: [PATCH 08/20] remove logging

---
 src/middleware/common.middleware.js | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/src/middleware/common.middleware.js b/src/middleware/common.middleware.js
index d1caf5b07..f13b58629 100644
--- a/src/middleware/common.middleware.js
+++ b/src/middleware/common.middleware.js
@@ -473,8 +473,6 @@ export const getUniqueDatasetFieldsFromSpecification = (req, res, next) => {
 export const constructSpecificationTable = (req, res, next) => {
   const { datasetFields } = req
   // Filter out internal system fields that shouldn't be displayed
-  logger.info('No specification found, constructing specification from dataset fields', { dataset: req.dataset.dataset, datasetFields: datasetFields.map(df => df.field) })
-  logger.info('pulling from collection field dataset_field where dataset = dataset.collection, so using collection as lookup key for dataset fields table, not dataset name', { collection: req.dataset.collection })
   const systemFields = ['entity', 'prefix', 'entry-number', 'organisation-entity', 'organisation']
 
   req.specification = {
@@ -493,32 +491,17 @@ export const constructSpecificationTable = (req, res, next) => {
  * @function
  * @description Middleware chain to process the dataset specification and prepare it for the issue table, conditional execution on whether a specification exists
  */
-/** @param {string} step */
-const logSpecStep = (step) => (/** @type {any} */ req, /** @type {any} */ _res, /** @type {Function} */ next) => {
-  logger.debug({ message: `processSpecification: ${step}`, type: types.App, dataset: req.params?.dataset, collection: req.dataset?.collection, hasSpecification: !!req.specification })
-  next()
-}
-
 export const processSpecificationMiddlewares = [
-  logSpecStep('fetchSpecification'),
   fetchSpecification,
-  logSpecStep('pullOutDatasetSpecification'),
   pullOutDatasetSpecification,
   // When specification exists, use field mappings from transform table
-  logSpecStep('replaceUnderscoreInSpecification'),
   onlyIf(req => req.specification, replaceUnderscoreInSpecification),
-  logSpecStep('fetchFieldMappings'),
   onlyIf(req => req.specification, fetchFieldMappings),
-  logSpecStep('addDatabaseFieldToSpecification'),
   onlyIf(req => req.specification, addDatabaseFieldToSpecification),
-  logSpecStep('filterOutSystemFields'),
   onlyIf(req => req.specification, filterOutSystemFields),
   // When no specification exists, use fields from dataset_field table
-  logSpecStep('fetchDatasetFields'),
   onlyIf(req => !req.specification, fetchDatasetFields),
-  logSpecStep('constructSpecificationTable'),
   onlyIf(req => !req.specification, constructSpecificationTable),
-  logSpecStep('getUniqueDatasetFieldsFromSpecification'),
   getUniqueDatasetFieldsFromSpecification
 ]
 

From 37261ea52a1365491707e0d2ff119cce7e9dd5f0 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Thu, 19 Mar 2026 14:59:15 +0000
Subject: [PATCH 09/20] hard code datasets for local plan rollout, production
 only

---
 config/default.yaml | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/config/default.yaml b/config/default.yaml
index 7ddd0f94c..8f5167f28 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -115,6 +115,27 @@ datasetsConfig:
     entityDisplayName:
       base: infrastructure funding statement
       variable: statement
+  development-plan-document:
+    guidanceUrl: /guidance/specifications/development-plan
+    entityDisplayName:
+      variable: plan
+  development-plan-timetable:
+    guidanceUrl: /guidance/specifications/development-plan
+    entityDisplayName:
+      variable: plan
+  local-plan:
+    guidanceUrl: /guidance/specifications/development-plan
+    entityDisplayName:
+      variable: plan
+  minerals-plan:
+    guidanceUrl: /guidance/specifications/development-plan
+    entityDisplayName:
+      variable: plan
+  waste-plan:
+    guidanceUrl: /guidance/specifications/development-plan
+    entityDisplayName:
+      variable: plan
+  
 # Any dataset that has one of these three previous rules set, will be displayed in the LPA Dashboard to be checked.
 provisionReasons:
   - statutory

From b1f0b794ac3e70dee1bec04a169bf24d96d6fde0 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Thu, 19 Mar 2026 16:10:29 +0000
Subject: [PATCH 10/20] tests

---
 src/views/organisations/find.html             |  2 +-
 .../planning_group.playwright.test.js         | 56 +++++++++++++++++++
 test/unit/findPage.test.js                    |  9 ++-
 .../unit/middleware/common.middleware.test.js | 33 ++++++-----
 .../organisations.middleware.test.js          | 40 ++++---------
 5 files changed, 87 insertions(+), 53 deletions(-)
 create mode 100644 test/integration/planning_group.playwright.test.js

diff --git a/src/views/organisations/find.html b/src/views/organisations/find.html
index 4aadd2b89..685ef8931 100644
--- a/src/views/organisations/find.html
+++ b/src/views/organisations/find.html
@@ -55,7 +55,7 @@ <h2 class="blockHeading govuk-heading-m">{{ datasetType | datasetSlugToReadableN
           <div class="govuk-grid-column-two-thirds" data-filter="inner-block">
             {% for org in orgs %}
               <div class="js-filter-item" data-filter="item" data-filter-terms="{{ org.name }}">
-                <a href="/organisations/{{ org.organisation }}" class="govuk-link govuk-!-display-block govuk-!-margin-bottom-2">{{ org.name }}</a>
+                <a href="/organisations/{{ org.organisation }}" class="govuk-link govuk-!-display-block govuk-!-margin-bottom-2 govuk-!-font-size-19">{{ org.name }}</a>
                 <hr class="govuk-section-break govuk-section-break--visible govuk-!-margin-bottom-2">
               </div>
             {% endfor %}
diff --git a/test/integration/planning_group.playwright.test.js b/test/integration/planning_group.playwright.test.js
new file mode 100644
index 000000000..788d2c1bd
--- /dev/null
+++ b/test/integration/planning_group.playwright.test.js
@@ -0,0 +1,56 @@
+import { test, expect } from '@playwright/test'
+
+const resetWiremock = async () => {
+  await fetch('http://localhost:8001/__admin/mappings/reset', {
+    method: 'POST'
+  })
+}
+
+const addWiremockStub = async (stub) => {
+  await fetch('http://localhost:8001/__admin/mappings', {
+    method: 'POST',
+    headers: { 'Content-Type': 'application/json' },
+    body: JSON.stringify(stub)
+  })
+}
+
+test.beforeEach(async () => {
+  await resetWiremock()
+})
+
+test('An LPA that is a member of a planning group shows the group membership banner on the overview page', async ({ page }) => {
+  // Stub the local-planning-group entity endpoint to return a group containing local-authority:SLF
+  await addWiremockStub({
+    priority: 1,
+    request: {
+      method: 'GET',
+      urlPattern: '/entity.json.*prefix=local-planning-group.*'
+    },
+    response: {
+      status: 200,
+      jsonBody: {
+        entities: [
+          {
+            entity: 9000001,
+            name: 'South London Joint Planning Group',
+            prefix: 'local-planning-group',
+            reference: 'south-london-joint',
+            'organisation-entity': 9000001,
+            organisations: 'local-authority:SLF;local-authority:LBH',
+            'end-date': ''
+          }
+        ],
+        count: 1
+      }
+    }
+  })
+
+  // Navigate to the LPA overview for SLF
+  await page.goto('/organisations/local-authority:SLF')
+
+  // The Group Membership banner should be visible
+  await expect(page.getByText('Group Membership')).toBeVisible()
+
+  // The planning group name should appear as a link
+  await expect(page.getByRole('link', { name: 'South London Joint Planning Group' })).toBeVisible()
+})
diff --git a/test/unit/findPage.test.js b/test/unit/findPage.test.js
index 29cb15ecb..9d47dc582 100644
--- a/test/unit/findPage.test.js
+++ b/test/unit/findPage.test.js
@@ -40,13 +40,12 @@ describe(`Organisations Find Page (seed: ${seed})`, () => {
 
   it('Renders the correct organisation list with appropriate attributes', () => {
     const organisationList = document.querySelector('#search_results')
-    expect(organisationList.children.length).toBe(Object.keys(params.alphabetisedOrgs).length)
+    expect(organisationList.children.length).toBe(Object.keys(params.orgsByDataset).length)
 
-    Object.keys(params.alphabetisedOrgs).forEach((letter, i) => {
+    Object.keys(params.orgsByDataset).forEach((datasetType, i) => {
       const organisationSection = organisationList.children[i]
-      expect(organisationSection.querySelector('.blockHeading').textContent).toBe(letter)
-      const organisationListItems = organisationSection.querySelector('.govuk-list').children
-      params.alphabetisedOrgs[letter].forEach((organisation, j) => {
+      const organisationListItems = organisationSection.querySelectorAll('[data-filter="item"]')
+      params.orgsByDataset[datasetType].forEach((organisation, j) => {
         expect(organisationListItems[j].textContent).toContain(organisation.name)
         expect(organisationListItems[j].getAttribute('data-filter')).toEqual('item')
         expect(organisationListItems[j].getAttribute('data-filter-terms')).toEqual(organisation.name)
diff --git a/test/unit/middleware/common.middleware.test.js b/test/unit/middleware/common.middleware.test.js
index 7ead80739..0f93afeca 100644
--- a/test/unit/middleware/common.middleware.test.js
+++ b/test/unit/middleware/common.middleware.test.js
@@ -10,7 +10,8 @@ vi.mock('../../../src/services/performanceDbApi.js')
 
 vi.mock('../../../src/services/platformApi.js', () => ({
   default: {
-    fetchEntities: vi.fn()
+    fetchEntities: vi.fn(),
+    fetchAllEntities: vi.fn()
   }
 }))
 
@@ -1580,20 +1581,20 @@ describe('preventIndexing middleware', () => {
     })
 
     it('sets req.authority to "some" when no authoritative but some quality entities exist', async () => {
-      platformApi.fetchEntities
-        .mockResolvedValueOnce({ formattedData: [] }) // authoritative query returns empty
-        .mockResolvedValueOnce({ formattedData: [{ entity: '2', name: 'Some Quality Entity' }] }) // some query returns data
+      platformApi.fetchEntities.mockResolvedValueOnce({ formattedData: [] }) // authoritative query returns empty
+      platformApi.fetchAllEntities.mockResolvedValueOnce({ formattedData: [{ entity: '2', name: 'Some Quality Entity' }] }) // some query returns data
 
       await prepareAuthority(req, res, next)
 
-      expect(platformApi.fetchEntities).toHaveBeenCalledTimes(2)
-      expect(platformApi.fetchEntities).toHaveBeenNthCalledWith(1, {
+      expect(platformApi.fetchEntities).toHaveBeenCalledTimes(1)
+      expect(platformApi.fetchEntities).toHaveBeenCalledWith({
         organisation_entity: '12345',
         dataset: 'local-plan-boundary',
         quality: 'authoritative',
         limit: 1
       })
-      expect(platformApi.fetchEntities).toHaveBeenNthCalledWith(2, {
+      expect(platformApi.fetchAllEntities).toHaveBeenCalledTimes(1)
+      expect(platformApi.fetchAllEntities).toHaveBeenCalledWith({
         organisation_entity: '12345',
         dataset: 'local-plan-boundary',
         quality: 'some'
@@ -1603,13 +1604,13 @@ describe('preventIndexing middleware', () => {
     })
 
     it('sets req.authority to empty string when neither authoritative nor some quality entities exist', async () => {
-      platformApi.fetchEntities
-        .mockResolvedValueOnce({ formattedData: [] }) // authoritative query returns empty
-        .mockResolvedValueOnce({ formattedData: [] }) // some query returns empty
+      platformApi.fetchEntities.mockResolvedValueOnce({ formattedData: [] }) // authoritative query returns empty
+      platformApi.fetchAllEntities.mockResolvedValueOnce({ formattedData: [] }) // some query returns empty
 
       await prepareAuthority(req, res, next)
 
-      expect(platformApi.fetchEntities).toHaveBeenCalledTimes(2)
+      expect(platformApi.fetchEntities).toHaveBeenCalledTimes(1)
+      expect(platformApi.fetchAllEntities).toHaveBeenCalledTimes(1)
       expect(req.authority).toBe('')
       expect(next).toHaveBeenCalledTimes(1)
     })
@@ -1626,9 +1627,8 @@ describe('preventIndexing middleware', () => {
     })
 
     it('handles null formattedData gracefully', async () => {
-      platformApi.fetchEntities
-        .mockResolvedValueOnce({ formattedData: null }) // authoritative query returns null
-        .mockResolvedValueOnce({ formattedData: null }) // some query returns null
+      platformApi.fetchEntities.mockResolvedValueOnce({ formattedData: null }) // authoritative query returns null
+      platformApi.fetchAllEntities.mockResolvedValueOnce({ formattedData: null }) // some query returns null
 
       await prepareAuthority(req, res, next)
 
@@ -1637,9 +1637,8 @@ describe('preventIndexing middleware', () => {
     })
 
     it('handles undefined formattedData gracefully', async () => {
-      platformApi.fetchEntities
-        .mockResolvedValueOnce({}) // authoritative query returns no formattedData
-        .mockResolvedValueOnce({}) // some query returns no formattedData
+      platformApi.fetchEntities.mockResolvedValueOnce({}) // authoritative query returns no formattedData
+      platformApi.fetchAllEntities.mockResolvedValueOnce({}) // some query returns no formattedData
 
       await prepareAuthority(req, res, next)
 
diff --git a/test/unit/middleware/organisations.middleware.test.js b/test/unit/middleware/organisations.middleware.test.js
index 9650e533a..4ce7ecf28 100644
--- a/test/unit/middleware/organisations.middleware.test.js
+++ b/test/unit/middleware/organisations.middleware.test.js
@@ -21,21 +21,13 @@ describe('organisations.middleware.js', () => {
       prepareGetOrganisationsTemplateParams(req, res, next)
 
       const expectedTemplatePrams = {
-        alphabetisedOrgs: {
-          A: [
-            { name: 'Aardvark Healthcare', organisation: 'Aardvark Healthcare' }
-          ],
-          B: [
+        orgsByDataset: {
+          other: [
+            { name: 'Aardvark Healthcare', organisation: 'Aardvark Healthcare' },
             { name: 'Bath NHS Trust', organisation: 'Bath NHS Trust' },
-            { name: 'Bristol Hospital', organisation: 'Bristol Hospital' }
-          ],
-          C: [
-            { name: 'Cardiff Health Board', organisation: 'Cardiff Health Board' }
-          ],
-          D: [
-            { name: 'Derbyshire Healthcare', organisation: 'Derbyshire Healthcare' }
-          ],
-          E: [
+            { name: 'Bristol Hospital', organisation: 'Bristol Hospital' },
+            { name: 'Cardiff Health Board', organisation: 'Cardiff Health Board' },
+            { name: 'Derbyshire Healthcare', organisation: 'Derbyshire Healthcare' },
             { name: 'East Sussex NHS Trust', organisation: 'East Sussex NHS Trust' }
           ]
         }
@@ -52,22 +44,10 @@ describe('organisations.middleware.js', () => {
     const next = vi.fn()
 
     req.templateParams = {
-      alphabetisedOrgs: {
-        A: [
-          { name: 'Aardvark Healthcare', organisation: 'Aardvark Healthcare' }
-        ],
-        B: [
-          { name: 'Bath NHS Trust', organisation: 'Bath NHS Trust' },
-          { name: 'Bristol Hospital', organisation: 'Bristol Hospital' }
-        ],
-        C: [
-          { name: 'Cardiff Health Board', organisation: 'Cardiff Health Board' }
-        ],
-        D: [
-          { name: 'Derbyshire Healthcare', organisation: 'Derbyshire Healthcare' }
-        ],
-        E: [
-          { name: 'East Sussex NHS Trust', organisation: 'East Sussex NHS Trust' }
+      orgsByDataset: {
+        other: [
+          { name: 'Aardvark Healthcare', organisation: 'Aardvark Healthcare' },
+          { name: 'Bath NHS Trust', organisation: 'Bath NHS Trust' }
         ]
       }
     }

From 79dc595e9b32897f00d568812bc8455cabfc9352 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Thu, 19 Mar 2026 16:23:47 +0000
Subject: [PATCH 11/20] fetch all bug and schema change

---
 src/routes/schemas.js       | 4 ++--
 src/services/platformApi.js | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/routes/schemas.js b/src/routes/schemas.js
index 7a57935c5..7193cc74a 100644
--- a/src/routes/schemas.js
+++ b/src/routes/schemas.js
@@ -154,7 +154,7 @@ export const OrgOverviewPage = v.strictObject({
   datasetsWithErrors: v.integer(),
   isODPMember: v.boolean(),
   parentGroup: v.optional(v.nullable(v.array(v.strictObject({
-    entity: NonEmptyString,
+    entity: v.integer(),
     name: NonEmptyString,
     organisation: NonEmptyString
   })))),
@@ -201,7 +201,7 @@ export const OrgDatasetOverview = v.strictObject({
   }),
   planningGroupProvisions: PlanningGroupProvisionsField,
   parentGroup: v.optional(v.nullable(v.array(v.strictObject({
-    entity: NonEmptyString,
+    entity: v.integer(),
     name: NonEmptyString,
     organisation: NonEmptyString
   })))),
diff --git a/src/services/platformApi.js b/src/services/platformApi.js
index d68f803b9..1f6f1dea7 100644
--- a/src/services/platformApi.js
+++ b/src/services/platformApi.js
@@ -71,6 +71,7 @@ export default {
       if (params.dataset) queryParams.append('dataset', params.dataset)
       if (params.prefix) queryParams.append('prefix', params.prefix)
       if (params.organisation) queryParams.append('organisation', params.organisation)
+      if (params.quality) queryParams.append('quality', params.quality)
       queryParams.append('limit', pageSize)
       queryParams.append('offset', offset)
       const data = await queryPlatformAPI(`${config.mainWebsiteUrl}/entity.json?${queryParams.toString()}`, params)

From ada4ea5f015d0956e10f3dcfa7a258bd4227aed6 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Thu, 19 Mar 2026 16:30:17 +0000
Subject: [PATCH 12/20] lint and wiremock change

---
 .../authoritative_data.playwright.test.js     |  5 +-
 .../planning_group.playwright.test.js         | 82 +++++++++++--------
 2 files changed, 50 insertions(+), 37 deletions(-)

diff --git a/test/integration/authoritative_data.playwright.test.js b/test/integration/authoritative_data.playwright.test.js
index 273d2810a..4220c4743 100644
--- a/test/integration/authoritative_data.playwright.test.js
+++ b/test/integration/authoritative_data.playwright.test.js
@@ -1,9 +1,12 @@
 import { test, expect } from '@playwright/test'
 
 const resetWiremock = async () => {
-  await fetch('http://localhost:8001/__admin/mappings/reset', {
+  const response = await fetch('http://localhost:8001/__admin/mappings/reset', {
     method: 'POST'
   })
+  if (!response.ok) {
+    throw new Error(`Failed to reset WireMock mappings: ${response.status} ${await response.text()}`)
+  }
 }
 
 test.beforeEach(async () => {
diff --git a/test/integration/planning_group.playwright.test.js b/test/integration/planning_group.playwright.test.js
index 788d2c1bd..fcbdc4a09 100644
--- a/test/integration/planning_group.playwright.test.js
+++ b/test/integration/planning_group.playwright.test.js
@@ -1,56 +1,66 @@
 import { test, expect } from '@playwright/test'
 
 const resetWiremock = async () => {
-  await fetch('http://localhost:8001/__admin/mappings/reset', {
+  const response = await fetch('http://localhost:8001/__admin/mappings/reset', {
     method: 'POST'
   })
+  if (!response.ok) {
+    throw new Error(`Failed to reset WireMock mappings: ${response.status} ${await response.text()}`)
+  }
 }
 
 const addWiremockStub = async (stub) => {
-  await fetch('http://localhost:8001/__admin/mappings', {
+  const response = await fetch('http://localhost:8001/__admin/mappings', {
     method: 'POST',
     headers: { 'Content-Type': 'application/json' },
     body: JSON.stringify(stub)
   })
+  if (!response.ok) {
+    throw new Error(`Failed to add WireMock stub: ${response.status} ${await response.text()}`)
+  }
 }
 
-test.beforeEach(async () => {
-  await resetWiremock()
-})
+test.describe('Planning group', () => {
+  test.describe.configure({ mode: 'serial' })
 
-test('An LPA that is a member of a planning group shows the group membership banner on the overview page', async ({ page }) => {
-  // Stub the local-planning-group entity endpoint to return a group containing local-authority:SLF
-  await addWiremockStub({
-    priority: 1,
-    request: {
-      method: 'GET',
-      urlPattern: '/entity.json.*prefix=local-planning-group.*'
-    },
-    response: {
-      status: 200,
-      jsonBody: {
-        entities: [
-          {
-            entity: 9000001,
-            name: 'South London Joint Planning Group',
-            prefix: 'local-planning-group',
-            reference: 'south-london-joint',
-            'organisation-entity': 9000001,
-            organisations: 'local-authority:SLF;local-authority:LBH',
-            'end-date': ''
-          }
-        ],
-        count: 1
-      }
-    }
+  test.beforeEach(async () => {
+    await resetWiremock()
   })
 
-  // Navigate to the LPA overview for SLF
-  await page.goto('/organisations/local-authority:SLF')
+  test('An LPA that is a member of a planning group shows the group membership banner on the overview page', async ({ page }) => {
+    // Stub the local-planning-group entity endpoint to return a group containing local-authority:SLF
+    await addWiremockStub({
+      priority: 1,
+      request: {
+        method: 'GET',
+        urlPattern: '/entity.json.*prefix=local-planning-group.*'
+      },
+      response: {
+        status: 200,
+        jsonBody: {
+          entities: [
+            {
+              entity: 9000001,
+              name: 'South London Joint Planning Group',
+              prefix: 'local-planning-group',
+              reference: 'south-london-joint',
+              'organisation-entity': 9000001,
+              organisations: 'local-authority:SLF;local-authority:LBH',
+              'end-date': ''
+            }
+          ],
+          count: 1
+        }
+      }
+    })
 
-  // The Group Membership banner should be visible
-  await expect(page.getByText('Group Membership')).toBeVisible()
+    // Navigate to the LPA overview for SLF
+    await page.goto('/organisations/local-authority:SLF')
 
-  // The planning group name should appear as a link
-  await expect(page.getByRole('link', { name: 'South London Joint Planning Group' })).toBeVisible()
+    // The Group Membership banner should be visible
+    await expect(page.getByText('Group Membership')).toBeVisible()
+
+    // The planning group name should appear as a link
+    await expect(page.getByRole('link', { name: 'South London Joint Planning Group' })).toBeVisible()
+  })
 })

From 5996306f1ddca46f4d6531ec5a812133cf9fa914 Mon Sep 17 00:00:00 2001
From: Ben Hodgkiss <ben.hodgkiss@levellingup.gov.uk>
Date: Wed, 25 Mar 2026 11:41:26 +0000
Subject: [PATCH 13/20] Update default.yaml

---
 config/default.yaml | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/config/default.yaml b/config/default.yaml
index 8f5167f28..e5058b898 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -115,24 +115,20 @@ datasetsConfig:
     entityDisplayName:
       base: infrastructure funding statement
       variable: statement
-  development-plan-document:
-    guidanceUrl: /guidance/specifications/development-plan
-    entityDisplayName:
-      variable: plan
-  development-plan-timetable:
-    guidanceUrl: /guidance/specifications/development-plan
+  plan-timetable:
+    guidanceUrl: /guidance/specifications/plan
     entityDisplayName:
       variable: plan
   local-plan:
-    guidanceUrl: /guidance/specifications/development-plan
+    guidanceUrl: /guidance/specifications/plan
     entityDisplayName:
       variable: plan
   minerals-plan:
-    guidanceUrl: /guidance/specifications/development-plan
+    guidanceUrl: /guidance/specifications/plan
     entityDisplayName:
       variable: plan
   waste-plan:
-    guidanceUrl: /guidance/specifications/development-plan
+    guidanceUrl: /guidance/specifications/plan
     entityDisplayName:
       variable: plan
   

From 3d937fa5def308b54caf78ac209602bce61e6556 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Mon, 30 Mar 2026 10:52:05 +0100
Subject: [PATCH 14/20] allow dataset slug mapping to retry continually if
 failure on boot

---
 src/filters/filters.js                 |  3 ++-
 src/utils/datasetSlugToReadableName.js | 23 ++++++++++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/filters/filters.js b/src/filters/filters.js
index 655025d74..f303e19c7 100644
--- a/src/filters/filters.js
+++ b/src/filters/filters.js
@@ -32,7 +32,8 @@ export function statusToTagClass (status) {
 const { govukMarkdown, govukDateTime } = xGovFilters
 
 const addFilters = (nunjucksEnv) => {
-  nunjucksEnv.addFilter('datasetSlugToReadableName', datasetSlugToReadableName)
+  // Wrapper function for datasetSlugToReadableName filter to allow working with async loading of the mapping data
+  nunjucksEnv.addFilter('datasetSlugToReadableName', (...args) => datasetSlugToReadableName(...args))
 
   nunjucksEnv.addFilter('govukMarkdown', govukMarkdown)
   nunjucksEnv.addFilter('govukDateTime', govukDateTime)
diff --git a/src/utils/datasetSlugToReadableName.js b/src/utils/datasetSlugToReadableName.js
index 94c6e16d6..9da9a62d1 100644
--- a/src/utils/datasetSlugToReadableName.js
+++ b/src/utils/datasetSlugToReadableName.js
@@ -1,16 +1,25 @@
 import { makeDatasetSlugToReadableNameFilter } from '../filters/makeDatasetSlugToReadableNameFilter.js'
 import { getDatasetSlugNameMapping } from './datasetteQueries/getDatasetSlugNameMapping.js'
 
+const RETRY_INTERVAL_MS = 30_000
+
 let datasetSlugToReadableName = (slug) => slug
 
-const initDatasetSlugToReadableNameFilter = async () => {
-  try {
-    const mapping = await getDatasetSlugNameMapping()
-    datasetSlugToReadableName = makeDatasetSlugToReadableNameFilter(mapping)
-  } catch (error) {
-    console.error('Failed to load dataset mapping:', error)
-    datasetSlugToReadableName = (slug) => slug // Fallback to using the slug as-is
+const retryUntilLoaded = async () => {
+  while (true) {
+    try {
+      const mapping = await getDatasetSlugNameMapping()
+      datasetSlugToReadableName = makeDatasetSlugToReadableNameFilter(mapping)
+      return
+    } catch (error) {
+      console.error(`Failed to load dataset mapping, retrying in ${RETRY_INTERVAL_MS / 1000}s:`, error)
+      await new Promise(resolve => setTimeout(resolve, RETRY_INTERVAL_MS))
+    }
   }
+}
+
+const initDatasetSlugToReadableNameFilter = async () => {
+  retryUntilLoaded() // keeps trying to update mapping until success
   return datasetSlugToReadableName
 }
 

From 60f69e6c3735258958763eda40c6140d582aa4ce Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Mon, 30 Mar 2026 13:22:08 +0100
Subject: [PATCH 15/20] revert yaml for plan dataset list

---
 config/default.yaml | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/config/default.yaml b/config/default.yaml
index e5058b898..7ddd0f94c 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -115,23 +115,6 @@ datasetsConfig:
     entityDisplayName:
       base: infrastructure funding statement
       variable: statement
-  plan-timetable:
-    guidanceUrl: /guidance/specifications/plan
-    entityDisplayName:
-      variable: plan
-  local-plan:
-    guidanceUrl: /guidance/specifications/plan
-    entityDisplayName:
-      variable: plan
-  minerals-plan:
-    guidanceUrl: /guidance/specifications/plan
-    entityDisplayName:
-      variable: plan
-  waste-plan:
-    guidanceUrl: /guidance/specifications/plan
-    entityDisplayName:
-      variable: plan
-  
 # Any dataset that has one of these three previous rules set, will be displayed in the LPA Dashboard to be checked.
 provisionReasons:
   - statutory

From ec881146e651b4c1ce8af76908e30c87f4d819d2 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Mon, 30 Mar 2026 13:31:58 +0100
Subject: [PATCH 16/20] use logger for warn

---
 src/utils/datasetSlugToReadableName.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/utils/datasetSlugToReadableName.js b/src/utils/datasetSlugToReadableName.js
index 9da9a62d1..b6a3ff5b8 100644
--- a/src/utils/datasetSlugToReadableName.js
+++ b/src/utils/datasetSlugToReadableName.js
@@ -1,5 +1,6 @@
 import { makeDatasetSlugToReadableNameFilter } from '../filters/makeDatasetSlugToReadableNameFilter.js'
 import { getDatasetSlugNameMapping } from './datasetteQueries/getDatasetSlugNameMapping.js'
+import logger from './logger.js'
 
 const RETRY_INTERVAL_MS = 30_000
 
@@ -12,7 +13,7 @@ const retryUntilLoaded = async () => {
       datasetSlugToReadableName = makeDatasetSlugToReadableNameFilter(mapping)
       return
     } catch (error) {
-      console.error(`Failed to load dataset mapping, retrying in ${RETRY_INTERVAL_MS / 1000}s:`, error)
+      logger.warn(`Failed to load dataset mapping, retrying in ${RETRY_INTERVAL_MS / 1000}s:`, error)
       await new Promise(resolve => setTimeout(resolve, RETRY_INTERVAL_MS))
     }
   }

From 875f2a82b60a649ecb34e74fc2673edf0725425d Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Mon, 30 Mar 2026 13:52:46 +0100
Subject: [PATCH 17/20] unit test update

---
 test/unit/views/organisations/get-startedPage.test.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/unit/views/organisations/get-startedPage.test.js b/test/unit/views/organisations/get-startedPage.test.js
index 47d403217..441b6a7ac 100644
--- a/test/unit/views/organisations/get-startedPage.test.js
+++ b/test/unit/views/organisations/get-startedPage.test.js
@@ -26,7 +26,7 @@ describe(`Get Started Page (seed: ${seed})`, () => {
     expect(document.querySelector('span.govuk-caption-xl').textContent).toEqual(params.organisation.name)
     // Filter returns slug in tests (no mapping loaded), check slug passes through
     expect(document.querySelector('h1').textContent).toContain(params.dataset.dataset)
-    expect(document.querySelector('#main-content h2').textContent).toContain(`How to prepare and provide your ${params.dataset.dataset} data`)
+    expect(document.querySelector('#main-content h2.govuk-heading-l').textContent).toContain(`How to prepare and provide your ${params.dataset.dataset} data`)
   })
 
   it('Renders breadcrumbs correctly', () => {

From 9895c3b8aefcb30131a84cc39c3e9a5d937b31d9 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Tue, 31 Mar 2026 13:34:01 +0100
Subject: [PATCH 18/20] fix container reuse for wiremock

---
 .github/workflows/test.yml        | 1 +
 test/testContainers/localstack.js | 1 -
 test/testContainers/wiremock.js   | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 37f26d8fd..ff60c6639 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -23,6 +23,7 @@ jobs:
     environment: development
     env:
       DOCKER_REPO: ${{ secrets.DEPLOY_DOCKER_REPOSITORY }}
+      TESTCONTAINERS_REUSE_ENABLE: true
     steps:
       - uses: actions/checkout@v4
       - name: Install AWS CLI
diff --git a/test/testContainers/localstack.js b/test/testContainers/localstack.js
index 36290f3c3..81e944208 100644
--- a/test/testContainers/localstack.js
+++ b/test/testContainers/localstack.js
@@ -16,7 +16,6 @@ export default class Localstack {
   async stop () {
     console.log('Stopping LocalstackContainer')
     this.container = await new LocalstackContainer(this.image).withReuse(true).start()
-    this.container.stop()
     await this.container.stop()
   }
 
diff --git a/test/testContainers/wiremock.js b/test/testContainers/wiremock.js
index 99b74163b..bf905b035 100644
--- a/test/testContainers/wiremock.js
+++ b/test/testContainers/wiremock.js
@@ -43,6 +43,6 @@ export default class Wiremock {
         host: config.asyncRequestApi.port
       })
       .withReuse(true).start()
-    this.container.stop()
+    await this.container.stop()
   }
 }

From a2a046a4c30cd48c2927fbc11f8d9f3640b29cc4 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Tue, 31 Mar 2026 13:59:17 +0100
Subject: [PATCH 19/20] pin localstack to 3.1

---
 test/integration/global-setup.js    | 8 ++++++--
 test/integration/global-teardown.js | 5 ++++-
 test/testContainers/localstack.js   | 2 +-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/test/integration/global-setup.js b/test/integration/global-setup.js
index 8e8d11cc0..d1224f34c 100644
--- a/test/integration/global-setup.js
+++ b/test/integration/global-setup.js
@@ -12,6 +12,10 @@ setup('Global setup', async () => {
 
   await new Wiremock().start()
 
-  localstack = await new Localstack().start()
-  await localstack.createBucket(config.aws.bucket)
+  // In CI, LocalStack is provided by docker-compose with bucket already created via bootstrap script.
+  // Only start the testcontainer locally where docker-compose is not running.
+  if (!process.env.CI) {
+    localstack = await new Localstack().start()
+    await localstack.createBucket(config.aws.bucket)
+  }
 })
diff --git a/test/integration/global-teardown.js b/test/integration/global-teardown.js
index 19cc8040e..de5a7b6af 100644
--- a/test/integration/global-teardown.js
+++ b/test/integration/global-teardown.js
@@ -10,5 +10,8 @@ teardown('Global teardown', async () => {
 
   await new Wiremock().stop()
 
-  await new Localstack().stop()
+  // Only stop the testcontainer locally — in CI it was never started (docker-compose handles LocalStack).
+  if (!process.env.CI) {
+    await new Localstack().stop()
+  }
 })
diff --git a/test/testContainers/localstack.js b/test/testContainers/localstack.js
index 81e944208..d6bcee579 100644
--- a/test/testContainers/localstack.js
+++ b/test/testContainers/localstack.js
@@ -3,7 +3,7 @@ import { S3Client, CreateBucketCommand } from '@aws-sdk/client-s3'
 
 export default class Localstack {
   constructor () {
-    this.image = 'localstack/localstack:latest'
+    this.image = 'localstack/localstack:3.1'
     this.buckets = []
   }
 

From 06dca37daa6313d65d78188caaa4d7f51c148260 Mon Sep 17 00:00:00 2001
From: Matt Poole <matt.a.poole@outlook.com>
Date: Tue, 31 Mar 2026 14:47:41 +0100
Subject: [PATCH 20/20] load list of organisation types from config yaml files

---
 config/default.yaml                        | 7 ++++++-
 config/production.yaml                     | 4 ++++
 config/staging.yaml                        | 4 ++++
 src/middleware/organisations.middleware.js | 5 +----
 4 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/config/default.yaml b/config/default.yaml
index 7ddd0f94c..22ae91755 100644
--- a/config/default.yaml
+++ b/config/default.yaml
@@ -116,9 +116,14 @@ datasetsConfig:
       base: infrastructure funding statement
       variable: statement
 # Any dataset that has one of these three previous rules set, will be displayed in the LPA Dashboard to be checked.
+organisationTypes:
+  - local-authority
+  - national-park-authority
+  - development-corporation
+  - local-planning-group
 provisionReasons:
   - statutory
-  - prospective  
+  - prospective
   - expected
   - encouraged
 tablePageLength: 50
diff --git a/config/production.yaml b/config/production.yaml
index 0a27a30ee..bb60eb0c9 100644
--- a/config/production.yaml
+++ b/config/production.yaml
@@ -1,3 +1,7 @@
+organisationTypes:
+  - local-authority
+  - national-park-authority
+  - development-corporation
 asyncRequestApi: {
     url: http://production-pub-async-api-lb-636110663.eu-west-2.elb.amazonaws.com
 }
diff --git a/config/staging.yaml b/config/staging.yaml
index 833f0bbb1..dde3d2d27 100644
--- a/config/staging.yaml
+++ b/config/staging.yaml
@@ -1,3 +1,7 @@
+organisationTypes:
+  - local-authority
+  - national-park-authority
+  - development-corporation
 asyncRequestApi: {
     url: http://staging-pub-async-api-lb-12493311.eu-west-2.elb.amazonaws.com
 }
diff --git a/src/middleware/organisations.middleware.js b/src/middleware/organisations.middleware.js
index cb6ac83c4..5ad2c7dab 100644
--- a/src/middleware/organisations.middleware.js
+++ b/src/middleware/organisations.middleware.js
@@ -15,10 +15,7 @@ const fetchOrganisations = fetchMany({
       LEFT JOIN organisation o ON p.organisation = o.organisation
     WHERE
       (
-        p.organisation LIKE 'local-authority:%'
-        OR p.organisation LIKE 'national-park-authority:%'
-        OR p.organisation LIKE 'development-corporation:%'
-        OR p.organisation LIKE 'local-planning-group:%'
+        ${config.organisationTypes.map(type => `p.organisation LIKE '${type}:%'`).join('\n        OR ')}
       )
       AND (
         p.end_date IS NULL