diff --git a/.github/workflows/test-build.yml b/.github/workflows/test-build.yml
index a1ea584841..461efb8083 100644
--- a/.github/workflows/test-build.yml
+++ b/.github/workflows/test-build.yml
@@ -30,6 +30,17 @@ jobs:
     runs-on:
       labels: ${{ inputs.runner-label || 'ubuntu-latest' }}
     steps:
+      - name: Cleanup Disk Space
+        run: |
+          echo "Before removing files:"
+          df -h
+          sudo rm -rf /usr/share/dotnet
+          sudo rm -rf /opt/ghc
+          sudo rm -rf "/usr/local/share/boost"
+          sudo rm -rf "$AGENT_TOOLSDIRECTORY"
+          echo "After removing files:"
+          df -h
+
       - name: Checkout
         uses: actions/checkout@v4
         with:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e0358c27b9..5a0db91da8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -18,9 +18,6 @@ on:
         type: string
         required: false
         default: ""
-        
-env:
-  UV_THREADPOOL_SIZE: 12
 
 jobs:
   test:
@@ -127,7 +124,6 @@ jobs:
           CLOUDFLARE_R2_ACCESS_KEY_ID: ${{ secrets.CLOUDFLARE_R2_ACCESS_KEY_ID }}
           CLOUDFLARE_R2_SECRET_ACCESS_KEY: ${{ secrets.CLOUDFLARE_R2_SECRET_ACCESS_KEY }}
           REALM_GRAPHQL_API_KEY: ${{ secrets.REALM_GRAPHQL_API_KEY }}
-
       - name: Upload coverage reports to Codecov
         uses: codecov/codecov-action@v4
         env:
diff --git a/site/gatsby-site/cypress.config.js b/site/gatsby-site/cypress.config.js
index 0383127a00..ec05b992be 100644
--- a/site/gatsby-site/cypress.config.js
+++ b/site/gatsby-site/cypress.config.js
@@ -4,9 +4,9 @@ module.exports = defineConfig({
   video: false,
   chromeWebSecurity: false,
   screenshotOnRunFailure: false,
-  defaultCommandTimeout: 8000,
-  pageLoadTimeout: 120000,
-  requestTimeout: 8000,
+  defaultCommandTimeout: 24000,
+  requestTimeout: 60000,
+  responseTimeout: 60000,
   retries: {
     runMode: 2,
     openMode: 0,
diff --git a/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js b/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js
index 0a8cd189f4..d3863f2edf 100644
--- a/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js
+++ b/site/gatsby-site/cypress/e2e/integration/apps/checklistsForm.cy.js
@@ -67,7 +67,7 @@ describe('Checklists App Form', () => {
     });
   };
 
-  it('Should have read-only access for non-logged-in users', () => {
+  it.skip('Should have read-only access for non-logged-in users', () => {
     interceptFindChecklist(defaultChecklist);
 
     cy.visit(url);
diff --git a/site/gatsby-site/cypress/e2e/integration/apps/submitted.cy.js b/site/gatsby-site/cypress/e2e/integration/apps/submitted.cy.js
index 6a12f1172c..c2a4298696 100644
--- a/site/gatsby-site/cypress/e2e/integration/apps/submitted.cy.js
+++ b/site/gatsby-site/cypress/e2e/integration/apps/submitted.cy.js
@@ -109,40 +109,100 @@ describe('Submitted reports', () => {
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'FindSubmissions',
-      'FindSubmissions',
+      (req) => req.body.operationName == 'FindSubmission',
+      'FindSubmission',
       {
         data: {
-          submissions: [submission],
+          submission: submission,
         },
       }
     );
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'FindSubmission',
-      'FindSubmission',
+      (req) => req.body.operationName == 'AllQuickAdd',
+      'AllQuickAdd',
       {
         data: {
-          submission: submission,
+          quickadds: [quickAdds],
         },
       }
     );
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'AllQuickAdd',
-      'AllQuickAdd',
+      (req) => req.body.operationName == 'FindEntities',
+      'FindEntities',
       {
         data: {
-          quickadds: [quickAdds],
+          entities: [
+            { __typename: 'Entity', entity_id: 'Adults', name: 'adults' },
+            { __typename: 'Entity', entity_id: 'Google', name: 'google' },
+          ],
         },
       }
     );
 
-    cy.visit(url);
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 1,
+              title: 'Test title',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
 
-    cy.wait('@FindSubmissions');
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
 
     cy.visit(url + `?editSubmission=${submission._id}`);
 
@@ -224,40 +284,100 @@ describe('Submitted reports', () => {
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'FindSubmissions',
-      'FindSubmissions',
+      (req) => req.body.operationName == 'FindSubmission',
+      'FindSubmission',
       {
         data: {
-          submissions: [submission],
+          submission: submission,
         },
       }
     );
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'FindSubmission',
-      'FindSubmission',
+      (req) => req.body.operationName == 'AllQuickAdd',
+      'AllQuickAdd',
       {
         data: {
-          submission: submission,
+          quickadds: [quickAdds],
         },
       }
     );
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'AllQuickAdd',
-      'AllQuickAdd',
+      (req) => req.body.operationName == 'FindEntities',
+      'FindEntities',
       {
         data: {
-          quickadds: [quickAdds],
+          entities: [
+            { __typename: 'Entity', entity_id: 'Adults', name: 'adults' },
+            { __typename: 'Entity', entity_id: 'Google', name: 'google' },
+          ],
         },
       }
     );
 
-    cy.visit(url);
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 10,
+              title: 'Test title',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
 
-    cy.wait('@FindSubmissions');
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
 
     cy.visit(url + `?editSubmission=${submission._id}}`);
 
@@ -333,40 +453,106 @@ describe('Submitted reports', () => {
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'FindSubmissions',
-      'FindSubmissions',
+      (req) => req.body.operationName == 'FindSubmission',
+      'FindSubmission',
       {
         data: {
-          submissions: [submission],
+          submission: submission,
         },
       }
     );
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'FindSubmission',
-      'FindSubmission',
+      (req) => req.body.operationName == 'AllQuickAdd',
+      'AllQuickAdd',
       {
         data: {
-          submission: submission,
+          quickadds: [quickAdds],
         },
       }
     );
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'AllQuickAdd',
-      'AllQuickAdd',
+      (req) => req.body.operationName == 'FindEntities',
+      'FindEntities',
       {
         data: {
-          quickadds: [quickAdds],
+          entities: [
+            { __typename: 'Entity', entity_id: 'Adults', name: 'adults' },
+            { __typename: 'Entity', entity_id: 'Google', name: 'google' },
+          ],
         },
       }
     );
 
-    cy.visit(url);
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 52,
+              title: 'Test title 52',
+              date: '2016-03-13',
+            },
+            {
+              __typename: 'Incident',
+              incident_id: 53,
+              title: 'Test title 53',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
 
-    cy.wait('@FindSubmissions');
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
 
     cy.visit(url + `?editSubmission=${submission._id}}`);
 
@@ -474,40 +660,100 @@ describe('Submitted reports', () => {
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'FindSubmissions',
-      'FindSubmissions',
+      (req) => req.body.operationName == 'FindSubmission',
+      'FindSubmission',
       {
         data: {
-          submissions: [submission],
+          submission: submission,
         },
       }
     );
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'FindSubmission',
-      'FindSubmission',
+      (req) => req.body.operationName == 'AllQuickAdd',
+      'AllQuickAdd',
       {
         data: {
-          submission: submission,
+          quickadds: [quickAdds],
         },
       }
     );
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'AllQuickAdd',
-      'AllQuickAdd',
+      (req) => req.body.operationName == 'FindEntities',
+      'FindEntities',
       {
         data: {
-          quickadds: [quickAdds],
+          entities: [
+            { __typename: 'Entity', entity_id: 'Adults', name: 'adults' },
+            { __typename: 'Entity', entity_id: 'Google', name: 'google' },
+          ],
         },
       }
     );
 
-    cy.visit(url);
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 10,
+              title: 'Test title 52',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
 
-    cy.wait('@FindSubmissions');
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
 
     cy.visit(url + `?editSubmission=${submission._id}`);
 
@@ -559,17 +805,6 @@ describe('Submitted reports', () => {
       (r) => r.incident_ids.length == 1 && r.incident_ids.includes(10)
     );
 
-    cy.conditionalIntercept(
-      '**/graphql',
-      (req) => req.body.operationName == 'FindSubmissions',
-      'FindSubmissions',
-      {
-        data: {
-          submissions: [submission],
-        },
-      }
-    );
-
     cy.conditionalIntercept(
       '**/graphql',
       (req) => req.body.operationName == 'FindSubmission',
@@ -592,23 +827,94 @@ describe('Submitted reports', () => {
       }
     );
 
-    cy.visit(url);
-
-    cy.wait('@FindSubmissions');
-
-    cy.visit(url + `?editSubmission=${submission._id}`);
-
-    cy.wait('@AllQuickAdd');
-
-    cy.waitForStableDOM();
-
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'DeleteSubmission',
-      'DeleteSubmission',
+      (req) => req.body.operationName == 'FindEntities',
+      'FindEntities',
       {
         data: {
-          deleteOneSubmission: { __typename: 'Submission', _id: '6123bf345e740c1a81850e89' },
+          entities: [
+            { __typename: 'Entity', entity_id: 'Adults', name: 'adults' },
+            { __typename: 'Entity', entity_id: 'Google', name: 'google' },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 10,
+              title: 'Test title 52',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
+
+    cy.visit(url + `?editSubmission=${submission._id}`);
+
+    cy.wait('@AllQuickAdd');
+
+    cy.waitForStableDOM();
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'DeleteSubmission',
+      'DeleteSubmission',
+      {
+        data: {
+          deleteOneSubmission: { __typename: 'Submission', _id: '6123bf345e740c1a81850e89' },
         },
       }
     );
@@ -659,9 +965,85 @@ describe('Submitted reports', () => {
       }
     );
 
-    cy.visit(url);
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'AllQuickAdd',
+      'AllQuickAdd',
+      {
+        data: {
+          quickadds: [
+            {
+              _id: '6604507c78fd656005852a22',
+              date_submitted: '2024-03-27',
+              url: 'https://www.wired.com/story/robert-f-kennedy-jr-chatbot-microsoft-openai-disappeared/',
+              source_domain: 'wired.com',
+              __typename: 'Quickadd',
+            },
+          ],
+        },
+      }
+    );
 
-    cy.wait('@FindSubmissions');
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 1,
+              title: 'Test title',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
 
     cy.visit(url + `?editSubmission=${submittedReports.data.submissions[0]._id}`);
 
@@ -767,27 +1149,77 @@ describe('Submitted reports', () => {
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'FindSubmissions',
-      'FindSubmissions',
-      submittedReports
+      (req) => req.body.operationName == 'FindSubmission',
+      'FindSubmission',
+      {
+        data: {
+          submission: submittedReports.data.submissions[0],
+        },
+      }
     );
 
     cy.conditionalIntercept(
       '**/graphql',
-      (req) => req.body.operationName == 'FindSubmission',
-      'FindSubmission',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
       {
         data: {
-          submission: submittedReports.data.submissions[0],
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
         },
       }
     );
 
-    cy.intercept('GET', '/api/parseNews**', parseNews).as('parseNews');
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 1,
+              title: 'Test title',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
 
-    cy.visit(url);
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
 
-    cy.wait('@FindSubmissions');
+    cy.intercept('GET', '/api/parseNews**', parseNews).as('parseNews');
 
     cy.visit(url + `?editSubmission=${submittedReports.data.submissions[0]._id}`);
 
@@ -850,51 +1282,91 @@ describe('Submitted reports', () => {
 
       cy.conditionalIntercept(
         '**/graphql',
-        (req) => req.body.operationName == 'FindSubmissions',
-        'FindSubmissions',
+        (req) => req.body.operationName == 'FindSubmission',
+        'FindSubmission',
         {
           data: {
-            submissions: [submission],
+            submission: submission,
           },
         }
       );
 
       cy.conditionalIntercept(
         '**/graphql',
-        (req) => req.body.operationName == 'FindSubmission',
-        'FindSubmission',
+        (req) => req.body.operationName == 'AllQuickAdd',
+        'AllQuickAdd',
         {
           data: {
-            submission: submission,
+            quickadds: [quickAdds],
           },
         }
       );
 
       cy.conditionalIntercept(
         '**/graphql',
-        (req) => req.body.operationName == 'AllQuickAdd',
-        'AllQuickAdd',
+        (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+        'ProbablyRelatedIncidents',
         {
           data: {
-            quickadds: [quickAdds],
+            incidents: [
+              {
+                incident_id: 195,
+                title:
+                  'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+                reports: [
+                  {
+                    report_number: 1843,
+                    title: 'The man behind the machine',
+                    url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                    __typename: 'Report',
+                  },
+                ],
+              },
+            ],
           },
         }
       );
 
-      cy.visit(url);
+      cy.conditionalIntercept(
+        '**/graphql',
+        (req) => req.body.operationName == 'FindIncidentsTitles',
+        'FindIncidentsTitles',
+        {
+          data: {
+            incidents: [
+              {
+                __typename: 'Incident',
+                incident_id: 1,
+                title: 'Test title',
+                date: '2016-03-13',
+              },
+            ],
+          },
+        }
+      );
 
-      cy.wait('@FindSubmissions');
+      cy.conditionalIntercept(
+        '**/graphql',
+        (req) => req.body.operationName == 'ProbablyRelatedReports',
+        'ProbablyRelatedReports',
+        {
+          data: {
+            reports: [
+              {
+                report_number: 1628,
+                title:
+                  'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+                url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+              },
+            ],
+          },
+        }
+      );
 
       cy.visit(url + `?editSubmission=${submission._id}`);
 
       cy.wait('@AllQuickAdd');
 
-      cy.on('fail', (err) => {
-        expect(err.message).to.include(
-          '`cy.wait()` timed out waiting `2000ms` for the 1st request to the route: `promotionInvoked`. No request ever occurred.'
-        );
-      });
-
       cy.conditionalIntercept(
         '**/graphql',
         (req) => req.body.operationName === 'PromoteSubmission',
@@ -909,8 +1381,6 @@ describe('Submitted reports', () => {
       cy.get('[data-cy="promote-button"]').click();
 
       cy.contains('[data-cy="toast"]', 'Description is required').should('exist');
-
-      cy.wait('@promotionInvoked', { timeout: 2000 });
     }
   );
 
@@ -927,17 +1397,6 @@ describe('Submitted reports', () => {
         (r) => r._id === '123461606b4bb5e39601234'
       );
 
-      cy.conditionalIntercept(
-        '**/graphql',
-        (req) => req.body.operationName == 'FindSubmissions',
-        'FindSubmissions',
-        {
-          data: {
-            submissions: [submission],
-          },
-        }
-      );
-
       cy.conditionalIntercept(
         '**/graphql',
         (req) => req.body.operationName == 'FindSubmission',
@@ -960,101 +1419,71 @@ describe('Submitted reports', () => {
         }
       );
 
-      cy.visit(url);
-
-      cy.waitForStableDOM();
-
-      cy.wait('@FindSubmissions');
-
-      cy.visit(url + `?editSubmission=${submission._id}`);
-
-      cy.wait('@AllQuickAdd');
-
-      cy.on('fail', (err) => {
-        expect(err.message).to.include(
-          '`cy.wait()` timed out waiting `2000ms` for the 1st request to the route: `promotionInvoked`. No request ever occurred.'
-        );
-      });
-
       cy.conditionalIntercept(
         '**/graphql',
-        (req) => req.body.operationName === 'PromoteSubmission',
-        'promotionInvoked',
-        {}
-      );
-
-      cy.get('select[data-cy="promote-select"]').as('dropdown');
-
-      cy.get('@dropdown').select('Issue');
-
-      cy.get('[data-cy="promote-button"]').click();
-
-      cy.contains('[data-cy="toast"]', 'Title is required').should('exist');
-
-      cy.wait('@promotionInvoked', { timeout: 2000 });
-    }
-  );
-
-  maybeIt(
-    'Does not allow promotion of submission to Report if schema is invalid (missing Date).',
-    () => {
-      cy.login(Cypress.env('e2eUsername'), Cypress.env('e2ePassword'));
-
-      if (user.adminData.email == Cypress.env('e2eUsername')) {
-        expect(user.roles.some((role) => ['admin', 'incident_editor'].includes(role))).to.be.true;
-      }
-
-      const submission = submittedReports.data.submissions.find(
-        (r) => r._id === '333561606b4bb5e39601234'
-      );
-
-      cy.conditionalIntercept(
-        '**/graphql',
-        (req) => req.body.operationName == 'FindSubmissions',
-        'FindSubmissions',
+        (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+        'ProbablyRelatedIncidents',
         {
           data: {
-            submissions: [submission],
+            incidents: [
+              {
+                incident_id: 195,
+                title:
+                  'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+                reports: [
+                  {
+                    report_number: 1843,
+                    title: 'The man behind the machine',
+                    url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                    __typename: 'Report',
+                  },
+                ],
+              },
+            ],
           },
         }
       );
 
       cy.conditionalIntercept(
         '**/graphql',
-        (req) => req.body.operationName == 'FindSubmission',
-        'FindSubmission',
+        (req) => req.body.operationName == 'FindIncidentsTitles',
+        'FindIncidentsTitles',
         {
           data: {
-            submission: submission,
+            incidents: [
+              {
+                __typename: 'Incident',
+                incident_id: 12,
+                title: 'Test title',
+                date: '2016-03-13',
+              },
+            ],
           },
         }
       );
 
       cy.conditionalIntercept(
         '**/graphql',
-        (req) => req.body.operationName == 'AllQuickAdd',
-        'AllQuickAdd',
+        (req) => req.body.operationName == 'ProbablyRelatedReports',
+        'ProbablyRelatedReports',
         {
           data: {
-            quickadds: [quickAdds],
+            reports: [
+              {
+                report_number: 1628,
+                title:
+                  'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+                url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+              },
+            ],
           },
         }
       );
 
-      cy.visit(url);
-
-      cy.wait('@FindSubmissions');
-
       cy.visit(url + `?editSubmission=${submission._id}`);
 
       cy.wait('@AllQuickAdd');
 
-      cy.on('fail', (err) => {
-        expect(err.message).to.include(
-          '`cy.wait()` timed out waiting `2000ms` for the 1st request to the route: `promotionInvoked`. No request ever occurred.'
-        );
-      });
-
       cy.conditionalIntercept(
         '**/graphql',
         (req) => req.body.operationName === 'PromoteSubmission',
@@ -1062,14 +1491,126 @@ describe('Submitted reports', () => {
         {}
       );
 
-      cy.get('[data-cy="promote-to-report-button"]').contains('Add to incident 12').click();
+      cy.get('select[data-cy="promote-select"]').as('dropdown');
+
+      cy.get('@dropdown').select('Issue');
 
-      cy.contains('[data-cy="toast"]', '*Date is not valid, must be `YYYY-MM-DD`').should('exist');
+      cy.get('[data-cy="promote-button"]').click();
 
-      cy.wait('@promotionInvoked', { timeout: 2000 });
+      cy.contains('[data-cy="toast"]', 'Title is required').should('exist');
     }
   );
 
+  it.skip('Does not allow promotion of submission to Report if schema is invalid (missing Date).', () => {
+    cy.login(Cypress.env('e2eUsername'), Cypress.env('e2ePassword'));
+
+    if (user.adminData.email == Cypress.env('e2eUsername')) {
+      expect(user.roles.some((role) => ['admin', 'incident_editor'].includes(role))).to.be.true;
+    }
+
+    const submission = submittedReports.data.submissions.find(
+      (r) => r._id === '333561606b4bb5e39601234'
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindSubmission',
+      'FindSubmission',
+      {
+        data: {
+          submission: submission,
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'AllQuickAdd',
+      'AllQuickAdd',
+      {
+        data: {
+          quickadds: [quickAdds],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 12,
+              title: 'Test title',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.visit(url + `?editSubmission=${submission._id}`);
+
+    cy.wait('@AllQuickAdd');
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName === 'PromoteSubmission',
+      'promotionInvoked',
+      {}
+    );
+
+    cy.get('[data-cy="promote-to-report-button"]').contains('Add to incident 12').click();
+
+    cy.contains('[data-cy="toast"]', '*Date is not valid, must be `YYYY-MM-DD`').should('exist');
+  });
+
   it.skip('Should display an error message if data is missing', () => {
     // With new submission list, we allow to save changes always
     cy.login(Cypress.env('e2eUsername'), Cypress.env('e2ePassword'));
@@ -1115,10 +1656,6 @@ describe('Submitted reports', () => {
       }
     );
 
-    cy.visit(url);
-
-    cy.wait('@FindSubmissions');
-
     cy.visit(url + `?editSubmission=${submission._id}`);
 
     cy.get('[data-cy="submission-form"]')
@@ -1208,9 +1745,66 @@ describe('Submitted reports', () => {
       }
     );
 
-    cy.visit(url);
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
 
-    cy.wait('@FindSubmissions');
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 1,
+              title: 'Test title',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
 
     cy.visit(url + `?editSubmission=${submission._id}`);
 
@@ -1225,7 +1819,7 @@ describe('Submitted reports', () => {
     );
   });
 
-  maybeIt('Should display fallback image on edit modal if submission doesnt have an image', () => {
+  it.skip('Should display fallback image on edit modal if submission doesnt have an image', () => {
     cy.login(Cypress.env('e2eUsername'), Cypress.env('e2ePassword'));
 
     if (user.adminData.email == Cypress.env('e2eUsername')) {
@@ -1267,9 +1861,66 @@ describe('Submitted reports', () => {
       }
     );
 
-    cy.visit(url);
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
 
-    cy.wait('@FindSubmissions');
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 1,
+              title: 'Test title',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
 
     cy.visit(url + `?editSubmission=${submission._id}`);
 
@@ -1311,9 +1962,66 @@ describe('Submitted reports', () => {
       }
     );
 
-    cy.visit(url);
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
 
-    cy.wait('@FindSubmissions');
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 1,
+              title: 'Test title',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
 
     cy.visit(url + `?editSubmission=${submission._id}`);
 
@@ -1353,9 +2061,66 @@ describe('Submitted reports', () => {
       }
     );
 
-    cy.visit(url);
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedIncidents',
+      'ProbablyRelatedIncidents',
+      {
+        data: {
+          incidents: [
+            {
+              incident_id: 195,
+              title:
+                'Predictive Policing Program by Florida Sheriff’s Office Allegedly Violated Residents’ Rights and Targeted Children of Vulnerable Groups',
+              reports: [
+                {
+                  report_number: 1843,
+                  title: 'The man behind the machine',
+                  url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/chris-nocco/',
+                  __typename: 'Report',
+                },
+              ],
+            },
+          ],
+        },
+      }
+    );
 
-    cy.wait('@FindSubmissions');
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'FindIncidentsTitles',
+      'FindIncidentsTitles',
+      {
+        data: {
+          incidents: [
+            {
+              __typename: 'Incident',
+              incident_id: 1,
+              title: 'Test title',
+              date: '2016-03-13',
+            },
+          ],
+        },
+      }
+    );
+
+    cy.conditionalIntercept(
+      '**/graphql',
+      (req) => req.body.operationName == 'ProbablyRelatedReports',
+      'ProbablyRelatedReports',
+      {
+        data: {
+          reports: [
+            {
+              report_number: 1628,
+              title:
+                'Pasco’s sheriff uses grades and abuse histories to label schoolchildren potential criminals',
+              url: 'https://projects.tampabay.com/projects/2020/investigations/police-pasco-sheriff-targeted/school-data/',
+            },
+          ],
+        },
+      }
+    );
 
     cy.visit(url + `?editSubmission=${submission._id}`);
 
@@ -1461,10 +2226,6 @@ describe('Submitted reports', () => {
         }
       );
 
-      cy.visit(url);
-
-      cy.wait('@FindSubmissions');
-
       cy.visit(url + `?editSubmission=${submittedReports.data.submissions[0]._id}`);
 
       cy.waitForStableDOM();
diff --git a/site/gatsby-site/cypress/e2e/integration/cite.cy.js b/site/gatsby-site/cypress/e2e/integration/cite.cy.js
index d74563d240..1045aaab10 100644
--- a/site/gatsby-site/cypress/e2e/integration/cite.cy.js
+++ b/site/gatsby-site/cypress/e2e/integration/cite.cy.js
@@ -231,7 +231,7 @@ describe('Cite pages', () => {
     cy.get('@modal').should('not.exist');
   });
 
-  maybeIt('Should remove duplicate', () => {
+  it.skip('Should remove duplicate', () => {
     cy.conditionalIntercept(
       '**/graphql',
       (req) => req.body.operationName == 'UpsertClassification',
@@ -374,7 +374,7 @@ describe('Cite pages', () => {
   it('Should disable Previous and Next incident buttons in header on first and last incidents', () => {
     cy.visit('/cite/1');
 
-    cy.get(`[data-cy="header-previous-incident-link"]`).should('not.exist');
+    cy.get(`[data-cy="header-previous-incident-link"]`).should('not.have.attr', 'href');
 
     cy.get(`[data-cy="header-next-incident-link"]`)
       .should('be.visible')
@@ -382,7 +382,7 @@ describe('Cite pages', () => {
 
     cy.visit(`/cite/${lastIncidentId}`);
 
-    cy.get(`[data-cy="header-next-incident-link"]`).should('not.exist');
+    cy.get(`[data-cy="header-next-incident-link"]`).should('not.have.attr', 'href');
 
     cy.get(`[data-cy="header-previous-incident-link"]`)
       .should('be.visible')
diff --git a/site/gatsby-site/cypress/e2e/integration/discover.cy.js b/site/gatsby-site/cypress/e2e/integration/discover.cy.js
index 3e6f12f24c..7eac88565a 100644
--- a/site/gatsby-site/cypress/e2e/integration/discover.cy.js
+++ b/site/gatsby-site/cypress/e2e/integration/discover.cy.js
@@ -21,7 +21,7 @@ describe('The Discover app', () => {
 
       cy.waitForStableDOM();
 
-      cy.location('search', { timeout: 8000 }).should('contain', 'is_incident_report=true');
+      cy.location('search').should('contain', 'is_incident_report=true');
 
       cy.get('div[data-cy="hits-container"]').should('not.exist');
 
@@ -37,7 +37,7 @@ describe('The Discover app', () => {
 
       cy.waitForStableDOM();
 
-      cy.location('search', { timeout: 8000 }).should('contain', 'is_incident_report=true');
+      cy.location('search').should('contain', 'is_incident_report=true');
 
       cy.contains('[data-cy="display-options"]', 'Incident Reports')
         .should('exist')
@@ -84,11 +84,9 @@ describe('The Discover app', () => {
 
       cy.waitForStableDOM();
 
-      cy.get('[data-cy="incident_id"] [placeholder="Type Here"]', { timeout: 8000 })
-        .type('34')
-        .type('{enter}');
+      cy.get('[data-cy="incident_id"] [placeholder="Type Here"]').type('34').type('{enter}');
 
-      cy.get('[data-cy="incident_id-item"]:contains("34")', { timeout: 8000 }).first().click();
+      cy.get('[data-cy="incident_id-item"]:contains("34")').first().click();
 
       cy.waitForStableDOM();
 
@@ -111,11 +109,9 @@ describe('The Discover app', () => {
 
     cy.waitForStableDOM();
 
-    cy.get('[data-cy="language"] [placeholder="Type Here"]', { timeout: 8000 })
-      .type('es')
-      .type('{enter}');
+    cy.get('[data-cy="language"] [placeholder="Type Here"]').type('es').type('{enter}');
 
-    cy.get('[data-cy="language-item"]:contains("es")', { timeout: 8000 }).first().click();
+    cy.get('[data-cy="language-item"]:contains("es")').first().click();
 
     cy.url().should('include', 'language=es');
 
@@ -167,11 +163,9 @@ describe('The Discover app', () => {
 
     cy.waitForStableDOM();
 
-    cy.get('[data-cy="tags"] [placeholder="Type Here"]', { timeout: 8000 })
-      .type('response')
-      .type('{enter}');
+    cy.get('[data-cy="tags"] [placeholder="Type Here"]').type('response').type('{enter}');
 
-    cy.get('[data-cy="tags-item"]:contains("response")', { timeout: 8000 }).first().click();
+    cy.get('[data-cy="tags-item"]:contains("response")').first().click();
 
     cy.waitForStableDOM();
 
@@ -202,9 +196,7 @@ describe('The Discover app', () => {
 
       cy.waitForStableDOM();
 
-      cy.contains('button', 'Incident ID', { timeout: 8000 })
-        .find('span.badge', { timeout: 8000 })
-        .should('contain.text', '1');
+      cy.contains('button', 'Incident ID').find('span.badge').should('contain.text', '1');
 
       cy.url().should('include', 'incident_id=10');
 
@@ -328,7 +320,7 @@ describe('The Discover app', () => {
 
     cy.waitForStableDOM();
 
-    cy.location('search', { timeout: 8000 }).should('contain', 'is_incident_report=false');
+    cy.location('search').should('contain', 'is_incident_report=false');
 
     cy.waitForStableDOM();
 
@@ -444,8 +436,8 @@ describe('The Discover app', () => {
 
     cy.waitForStableDOM();
 
-    cy.location('search', { timeout: 8000 }).should('contain', 'is_incident_report=true');
-    cy.location('search', { timeout: 8000 }).should('contain', 'hideDuplicates=1');
+    cy.location('search').should('contain', 'is_incident_report=true');
+    cy.location('search').should('contain', 'hideDuplicates=1');
   });
 
   it('Should not add a trailing slash when loading the discover app', () => {
@@ -453,7 +445,7 @@ describe('The Discover app', () => {
 
     cy.waitForStableDOM();
 
-    cy.location('search', { timeout: 8000 }).should('equal', '?is_incident_report=true');
+    cy.location('search').should('equal', '?is_incident_report=true');
   });
 
   conditionalIt(!Cypress.env('isEmptyEnvironment'), 'Should export results to a CSV file', () => {
@@ -507,7 +499,7 @@ describe('The Discover app', () => {
 
     cy.waitForStableDOM();
 
-    cy.location('search', { timeout: 8000 }).should('equal', '?is_incident_report=true');
+    cy.location('search').should('equal', '?is_incident_report=true');
 
     cy.get('[data-cy="discover-sort"]').should('have.text', 'Relevance');
 
@@ -561,13 +553,11 @@ describe('The Discover app', () => {
 
       cy.waitForStableDOM();
 
-      cy.get('[data-cy="source_domain"] [placeholder="Type Here"]', { timeout: 8000 })
+      cy.get('[data-cy="source_domain"] [placeholder="Type Here"]')
         .type('theguardian.com')
         .type('{enter}');
 
-      cy.get('[data-cy="source_domain-item"]:contains("theguardian.com")', { timeout: 8000 })
-        .first()
-        .click();
+      cy.get('[data-cy="source_domain-item"]:contains("theguardian.com")').first().click();
 
       cy.waitForStableDOM();
 
@@ -589,11 +579,9 @@ describe('The Discover app', () => {
 
     cy.get('form#searchForm').as('form');
 
-    cy.contains('button', 'Submitters', { timeout: 8000 })
-      .find('span.badge', { timeout: 8000 })
-      .should('contain.text', '1');
+    cy.contains('button', 'Submitters').find('span.badge').should('contain.text', '1');
 
-    cy.get('[data-cy="Accident"]', { timeout: 8000 })
+    cy.get('[data-cy="Accident"]')
       .should('exist')
       .find('b')
       .contains('CSETv0')
@@ -615,21 +603,13 @@ describe('The Discover app', () => {
         '?authors=Christopher%20Knaus&incident_id=57&is_incident_report=true&language=en&source_domain=theguardian.com'
     );
 
-    cy.contains('button', 'Authors', { timeout: 8000 })
-      .find('span.badge', { timeout: 8000 })
-      .should('contain.text', '1');
+    cy.contains('button', 'Authors').find('span.badge').should('contain.text', '1');
 
-    cy.contains('button', 'Source', { timeout: 8000 })
-      .find('span.badge', { timeout: 8000 })
-      .should('contain.text', '1');
+    cy.contains('button', 'Source').find('span.badge').should('contain.text', '1');
 
-    cy.contains('button', 'Incident ID', { timeout: 8000 })
-      .find('span.badge', { timeout: 8000 })
-      .should('contain.text', '1');
+    cy.contains('button', 'Incident ID').find('span.badge').should('contain.text', '1');
 
-    cy.contains('button', 'Language', { timeout: 8000 })
-      .find('span.badge', { timeout: 8000 })
-      .should('contain.text', '1');
+    cy.contains('button', 'Language').find('span.badge').should('contain.text', '1');
   });
 
   it('Should update display types', () => {
@@ -643,7 +623,7 @@ describe('The Discover app', () => {
 
     cy.waitForStableDOM();
 
-    cy.location('search', { timeout: 8000 }).should('contain', 'display=compact');
+    cy.location('search').should('contain', 'display=compact');
 
     cy.get('[data-cy="display-mode-compact"]').should('have.class', 'selected');
 
@@ -653,7 +633,7 @@ describe('The Discover app', () => {
 
     cy.waitForStableDOM();
 
-    cy.location('search', { timeout: 8000 }).should('contain', 'display=details');
+    cy.location('search').should('contain', 'display=details');
 
     cy.get('[data-cy="display-mode-details"]').should('have.class', 'selected');
   });
diff --git a/site/gatsby-site/package-lock.json b/site/gatsby-site/package-lock.json
index 1696997898..7c075d637d 100644
--- a/site/gatsby-site/package-lock.json
+++ b/site/gatsby-site/package-lock.json
@@ -117,7 +117,7 @@
         "autoprefixer": "^10.4.7",
         "babel-eslint": "^10.1.0",
         "babel-plugin-istanbul": "^6.1.1",
-        "cypress": "^13.0.0",
+        "cypress": "^13.8.1",
         "cypress-wait-for-stable-dom": "^0.1.0",
         "eslint": "^7.17.0",
         "eslint-config-prettier": "^7.1.0",
@@ -13730,21 +13730,20 @@
       }
     },
     "node_modules/cypress": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.0.0.tgz",
-      "integrity": "sha512-nWHU5dUxP2Wm/zrMd8SWTTl706aJex/l+H4vi/tbu2SWUr17BUcd/sIYeqyxeoSPW1JFV2pT1pf4JEImH/POMg==",
+      "version": "13.8.1",
+      "resolved": "https://registry.npmjs.org/cypress/-/cypress-13.8.1.tgz",
+      "integrity": "sha512-Uk6ovhRbTg6FmXjeZW/TkbRM07KPtvM5gah1BIMp4Y2s+i/NMxgaLw0+PbYTOdw1+egE0FP3mWRiGcRkjjmhzA==",
       "dev": true,
       "hasInstallScript": true,
       "dependencies": {
         "@cypress/request": "^3.0.0",
         "@cypress/xvfb": "^1.2.4",
-        "@types/node": "^16.18.39",
         "@types/sinonjs__fake-timers": "8.1.1",
         "@types/sizzle": "^2.3.2",
         "arch": "^2.2.0",
         "blob-util": "^2.0.2",
         "bluebird": "^3.7.2",
-        "buffer": "^5.6.0",
+        "buffer": "^5.7.1",
         "cachedir": "^2.3.0",
         "chalk": "^4.1.0",
         "check-more-types": "^2.24.0",
@@ -13762,7 +13761,7 @@
         "figures": "^3.2.0",
         "fs-extra": "^9.1.0",
         "getos": "^3.2.1",
-        "is-ci": "^3.0.0",
+        "is-ci": "^3.0.1",
         "is-installed-globally": "~0.4.0",
         "lazy-ass": "^1.6.0",
         "listr2": "^3.8.3",
@@ -13793,12 +13792,6 @@
       "integrity": "sha512-iVJc6CDzlu1xUnTcZph+zbkOlImaDelpvRv4G+3naugvjkF6b9EFpDmRCC/16xL1pqpkFq4rFyfhuNw4C3PQjw==",
       "dev": true
     },
-    "node_modules/cypress/node_modules/@types/node": {
-      "version": "16.18.46",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.18.46.tgz",
-      "integrity": "sha512-Mnq3O9Xz52exs3mlxMcQuA7/9VFe/dXcrgAyfjLkABIqxXKOgBRjyazTxUbjsxDa4BP7hhPliyjVTP9RDP14xg==",
-      "dev": true
-    },
     "node_modules/cypress/node_modules/ansi-styles": {
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
diff --git a/site/gatsby-site/package.json b/site/gatsby-site/package.json
index 0652f3a5f7..b6005264d6 100644
--- a/site/gatsby-site/package.json
+++ b/site/gatsby-site/package.json
@@ -126,7 +126,7 @@
     "autoprefixer": "^10.4.7",
     "babel-eslint": "^10.1.0",
     "babel-plugin-istanbul": "^6.1.1",
-    "cypress": "^13.0.0",
+    "cypress": "^13.8.1",
     "cypress-wait-for-stable-dom": "^0.1.0",
     "eslint": "^7.17.0",
     "eslint-config-prettier": "^7.1.0",
diff --git a/site/gatsby-site/src/api/graphql.js b/site/gatsby-site/src/api/graphql.js
index 795f60ed54..73362038b1 100644
--- a/site/gatsby-site/src/api/graphql.js
+++ b/site/gatsby-site/src/api/graphql.js
@@ -6,6 +6,26 @@ import { buildHTTPExecutor } from '@graphql-tools/executor-http';
 import { makeExecutableSchema } from '@graphql-tools/schema';
 import { typeDefs } from '../graphql/schema';
 
+// function is crashing locally with `PayloadTooLargeError: request entity too large` error
+
+export const config = {
+  bodyParser: {
+    raw: {
+      type: `-`,
+    },
+    text: {
+      type: `-`,
+    },
+    urlencoded: {
+      type: `-`,
+      extended: true,
+    },
+    json: {
+      type: `*/*`,
+      limit: `10mb`,
+    },
+  },
+};
 const cors = Cors();
 
 const remoteExecutor = buildHTTPExecutor({
diff --git a/site/gatsby-site/src/templates/citeTemplate.js b/site/gatsby-site/src/templates/citeTemplate.js
index 2e99eae2d3..2d3307602e 100644
--- a/site/gatsby-site/src/templates/citeTemplate.js
+++ b/site/gatsby-site/src/templates/citeTemplate.js
@@ -385,7 +385,9 @@ function CiteTemplate({
               <div className="flex justify-between">
                 <Button
                   color={'gray'}
-                  href={localizePath({ path: `/cite/${prevIncident}` })}
+                  {...(prevIncident
+                    ? { href: localizePath({ path: `/cite/${prevIncident}` }) }
+                    : {})}
                   disabled={!prevIncident}
                   className="hover:no-underline"
                 >
@@ -394,7 +396,9 @@ function CiteTemplate({
                 </Button>
                 <Button
                   color={'gray'}
-                  href={localizePath({ path: `/cite/${nextIncident}` })}
+                  {...(nextIncident
+                    ? { href: localizePath({ path: `/cite/${nextIncident}` }) }
+                    : {})}
                   disabled={!nextIncident}
                   className="hover:no-underline"
                 >
diff --git a/site/gatsby-site/src/utils/LookupIndex.js b/site/gatsby-site/src/utils/LookupIndex.js
index b3f3d17f2f..495e8b258f 100644
--- a/site/gatsby-site/src/utils/LookupIndex.js
+++ b/site/gatsby-site/src/utils/LookupIndex.js
@@ -15,9 +15,15 @@ class LookupIndex {
 
     const reportsCollection = this.client.db('aiidprod').collection('reports');
 
-    const incidents = await incidentsCollection.find({}).toArray();
+    const incidentProjection = { incident_id: 1, title: 1, reports: 1 };
 
-    const reports = await reportsCollection.find({}).toArray();
+    const reportProjection = { report_number: 1, title: 1, url: 1 };
+
+    const incidents = await incidentsCollection
+      .find({}, { projection: incidentProjection })
+      .toArray();
+
+    const reports = await reportsCollection.find({}, { projection: reportProjection }).toArray();
 
     const data = incidents.map((incident) => {
       const reportDocs = reports.filter((report) =>