diff --git a/editor.planx.uk/src/@planx/components/Checklist/Public/Public.tsx b/editor.planx.uk/src/@planx/components/Checklist/Public/Public.tsx
index fa60443d44..73710bb574 100644
--- a/editor.planx.uk/src/@planx/components/Checklist/Public/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/Checklist/Public/Public.tsx
@@ -1,28 +1,153 @@
-import { useStore } from "pages/FlowEditor/lib/store";
-import React from "react";
+import Grid from "@mui/material/Grid";
+import { visuallyHidden } from "@mui/utils";
+import {
+  ChecklistLayout,
+  checklistValidationSchema,
+} from "@planx/components/Checklist/model";
+import Card from "@planx/components/shared/Preview/Card";
+import { CardHeader } from "@planx/components/shared/Preview/CardHeader/CardHeader";
+import { getIn, useFormik } from "formik";
+import { partition } from "lodash";
+import React, { useEffect } from "react";
+import FullWidthWrapper from "ui/public/FullWidthWrapper";
+import ErrorWrapper from "ui/shared/ErrorWrapper";
+import { object } from "yup";
 
+import { Option } from "../../shared";
 import { Props } from "../types";
-import { AutoAnsweredChecklist } from "./components/AutoAnsweredChecklist";
-import { VisibleChecklist } from "./components/VisibleChecklist";
+import { ChecklistItems } from "./components/ChecklistItems";
+import { ExclusiveChecklistItem } from "./components/ExclusiveChecklistItem";
+import { GroupedChecklistOptions } from "./components/GroupedChecklistOptions";
+import { toggleNonExclusiveCheckbox } from "./helpers";
+import { useExclusiveOption } from "./hooks/useExclusiveOption";
+import { useSortedOptions } from "./hooks/useSortedOptions";
 
 const ChecklistComponent: React.FC<Props> = (props) => {
-  const autoAnswerableOptions = useStore(
-    (state) => state.autoAnswerableOptions
+  const {
+    description = "",
+    groupedOptions,
+    handleSubmit,
+    howMeasured,
+    info,
+    options,
+    policyRef,
+    text,
+    img,
+    previouslySubmittedData,
+    id,
+    autoAnswers,
+  } = props;
+
+  const formik = useFormik<{ checked: Array<string> }>({
+    initialValues: {
+      checked: previouslySubmittedData?.answers || [],
+    },
+    onSubmit: (values) => {
+      handleSubmit?.({ answers: values.checked });
+    },
+    validateOnBlur: false,
+    validateOnChange: false,
+    validationSchema: object({
+      checked: checklistValidationSchema(props),
+    }),
+  });
+
+  const { setCheckedFieldValue, layout } = useSortedOptions(
+    options,
+    groupedOptions,
+    formik,
   );
 
-  if (props.neverAutoAnswer) {
-    return <VisibleChecklist {...props} />;
-  }
+  const [exclusiveOptions, nonExclusiveOptions]: Option[][] = partition(
+    options,
+    (option) => option.data.exclusive,
+  );
+
+  const {
+    exclusiveOrOption,
+    exclusiveOptionIsChecked,
+    toggleExclusiveCheckbox,
+  } = useExclusiveOption(exclusiveOptions, formik);
 
-  let idsThatCanBeAutoAnswered: string[] | undefined;
-  if (props.id) idsThatCanBeAutoAnswered = autoAnswerableOptions(props.id);
-  if (idsThatCanBeAutoAnswered) {
-    return (
-      <AutoAnsweredChecklist {...props} answerIds={idsThatCanBeAutoAnswered} />
+  const changeCheckbox = (id: string) => () => {
+    const currentCheckedIds = formik.values.checked;
+
+    const currentCheckboxIsExclusiveOption =
+      exclusiveOrOption && id === exclusiveOrOption.id;
+
+    if (currentCheckboxIsExclusiveOption) {
+      const newCheckedIds = toggleExclusiveCheckbox(id);
+      setCheckedFieldValue(newCheckedIds);
+      return;
+    }
+    const newCheckedIds = toggleNonExclusiveCheckbox(
+      id,
+      currentCheckedIds,
+      exclusiveOrOption,
     );
+    setCheckedFieldValue(newCheckedIds);
+  };
+
+  // Auto-answered Checklists still set a breadcrumb even though they render null
+  useEffect(() => {
+    if (autoAnswers) {
+      handleSubmit?.({
+        answers: autoAnswers,
+        auto: true,
+      });
+    }
+  }, [autoAnswers]);
+
+  // Auto-answered Checklists are not publicly visible
+  if (autoAnswers) {
+    return null;
   }
 
-  return <VisibleChecklist {...props} />;
+  return (
+    <Card handleSubmit={formik.handleSubmit} isValid>
+      <CardHeader
+        title={text}
+        description={description}
+        info={info}
+        policyRef={policyRef}
+        howMeasured={howMeasured}
+        img={img}
+      />
+      <FullWidthWrapper>
+        <ErrorWrapper error={getIn(formik.errors, "checked")} id={id}>
+          <Grid
+            container
+            spacing={layout === ChecklistLayout.Images ? 2 : 0}
+            component="fieldset"
+          >
+            <legend style={visuallyHidden}>{text}</legend>
+            <ChecklistItems
+              nonExclusiveOptions={nonExclusiveOptions}
+              layout={layout}
+              changeCheckbox={changeCheckbox}
+              formik={formik}
+              exclusiveOptionIsChecked={exclusiveOptionIsChecked}
+            />
+            {exclusiveOrOption && (
+              <ExclusiveChecklistItem
+                exclusiveOrOption={exclusiveOrOption}
+                changeCheckbox={changeCheckbox}
+                formik={formik}
+              />
+            )}
+            {groupedOptions && (
+              <GroupedChecklistOptions
+                groupedOptions={groupedOptions}
+                previouslySubmittedData={previouslySubmittedData}
+                changeCheckbox={changeCheckbox}
+                formik={formik}
+              />
+            )}
+          </Grid>
+        </ErrorWrapper>
+      </FullWidthWrapper>
+    </Card>
+  );
 };
 
 export default ChecklistComponent;
diff --git a/editor.planx.uk/src/@planx/components/Checklist/Public/components/AutoAnsweredChecklist.tsx b/editor.planx.uk/src/@planx/components/Checklist/Public/components/AutoAnsweredChecklist.tsx
deleted file mode 100644
index bca1b81cc4..0000000000
--- a/editor.planx.uk/src/@planx/components/Checklist/Public/components/AutoAnsweredChecklist.tsx
+++ /dev/null
@@ -1,17 +0,0 @@
-import React, { useEffect } from "react";
-
-import { Props } from "../../types";
-
-// An auto-answered Checklist won't be seen by the user, but still leaves a breadcrumb
-export const AutoAnsweredChecklist: React.FC<
-  Props & { answerIds: string[] }
-> = (props) => {
-  useEffect(() => {
-    props.handleSubmit?.({
-      answers: props.answerIds,
-      auto: true,
-    });
-  }, [props]);
-
-  return null;
-};
diff --git a/editor.planx.uk/src/@planx/components/Checklist/Public/components/ChecklistItems.tsx b/editor.planx.uk/src/@planx/components/Checklist/Public/components/ChecklistItems.tsx
index 16f676ea8e..1ebbd7675a 100644
--- a/editor.planx.uk/src/@planx/components/Checklist/Public/components/ChecklistItems.tsx
+++ b/editor.planx.uk/src/@planx/components/Checklist/Public/components/ChecklistItems.tsx
@@ -6,7 +6,7 @@ import React from "react";
 import FormWrapper from "ui/public/FormWrapper";
 import ChecklistItem from "ui/shared/ChecklistItem/ChecklistItem";
 
-import { ChecklistLayout } from "./VisibleChecklist";
+import { ChecklistLayout } from "../../model";
 
 interface Props {
   nonExclusiveOptions: Option[];
@@ -50,7 +50,7 @@ export const ChecklistItems = ({
             checkbox
           />
         </Grid>
-      )
+      ),
     )}
   </>
 );
diff --git a/editor.planx.uk/src/@planx/components/Checklist/Public/components/VisibleChecklist.tsx b/editor.planx.uk/src/@planx/components/Checklist/Public/components/VisibleChecklist.tsx
deleted file mode 100644
index a2d730a1f5..0000000000
--- a/editor.planx.uk/src/@planx/components/Checklist/Public/components/VisibleChecklist.tsx
+++ /dev/null
@@ -1,138 +0,0 @@
-import Grid from "@mui/material/Grid";
-import { visuallyHidden } from "@mui/utils";
-import { checklistValidationSchema } from "@planx/components/Checklist/model";
-import Card from "@planx/components/shared/Preview/Card";
-import { CardHeader } from "@planx/components/shared/Preview/CardHeader/CardHeader";
-import { getIn, useFormik } from "formik";
-import { partition } from "lodash";
-import React from "react";
-import FullWidthWrapper from "ui/public/FullWidthWrapper";
-import ErrorWrapper from "ui/shared/ErrorWrapper";
-import { object } from "yup";
-
-import { Option } from "../../../shared";
-import { Props } from "../../types";
-import { useExclusiveOption } from "../hooks/useExclusiveOption";
-import { useSortedOptions } from "../hooks/useSortedOptions";
-import { ChecklistItems } from "./../components/ChecklistItems";
-import { ExclusiveChecklistItem } from "./../components/ExclusiveChecklistItem";
-import { toggleNonExclusiveCheckbox } from "./../helpers";
-import { GroupedChecklistOptions } from "./GroupedChecklistOptions";
-
-export enum ChecklistLayout {
-  Basic,
-  Grouped,
-  Images,
-}
-
-export const VisibleChecklist: React.FC<Props> = (props) => {
-  const {
-    description = "",
-    groupedOptions,
-    handleSubmit,
-    howMeasured,
-    info,
-    options,
-    policyRef,
-    text,
-    img,
-    previouslySubmittedData,
-    id,
-  } = props;
-
-  const formik = useFormik<{ checked: Array<string> }>({
-    initialValues: {
-      checked: previouslySubmittedData?.answers || [],
-    },
-    onSubmit: (values) => {
-      handleSubmit?.({ answers: values.checked });
-    },
-    validateOnBlur: false,
-    validateOnChange: false,
-    validationSchema: object({
-      checked: checklistValidationSchema(props),
-    }),
-  });
-
-  const { setCheckedFieldValue, layout } = useSortedOptions(
-    options,
-    groupedOptions,
-    formik
-  );
-
-  const [exclusiveOptions, nonExclusiveOptions]: Option[][] = partition(
-    options,
-    (option) => option.data.exclusive
-  );
-
-  const {
-    exclusiveOrOption,
-    exclusiveOptionIsChecked,
-    toggleExclusiveCheckbox,
-  } = useExclusiveOption(exclusiveOptions, formik);
-
-  const changeCheckbox = (id: string) => () => {
-    const currentCheckedIds = formik.values.checked;
-
-    const currentCheckboxIsExclusiveOption =
-      exclusiveOrOption && id === exclusiveOrOption.id;
-
-    if (currentCheckboxIsExclusiveOption) {
-      const newCheckedIds = toggleExclusiveCheckbox(id);
-      setCheckedFieldValue(newCheckedIds);
-      return;
-    }
-    const newCheckedIds = toggleNonExclusiveCheckbox(
-      id,
-      currentCheckedIds,
-      exclusiveOrOption
-    );
-    setCheckedFieldValue(newCheckedIds);
-  };
-
-  return (
-    <Card handleSubmit={formik.handleSubmit} isValid>
-      <CardHeader
-        title={text}
-        description={description}
-        info={info}
-        policyRef={policyRef}
-        howMeasured={howMeasured}
-        img={img}
-      />
-      <FullWidthWrapper>
-        <ErrorWrapper error={getIn(formik.errors, "checked")} id={id}>
-          <Grid
-            container
-            spacing={layout === ChecklistLayout.Images ? 2 : 0}
-            component="fieldset"
-          >
-            <legend style={visuallyHidden}>{text}</legend>
-            <ChecklistItems
-              nonExclusiveOptions={nonExclusiveOptions}
-              layout={layout}
-              changeCheckbox={changeCheckbox}
-              formik={formik}
-              exclusiveOptionIsChecked={exclusiveOptionIsChecked}
-            />
-            {exclusiveOrOption && (
-              <ExclusiveChecklistItem
-                exclusiveOrOption={exclusiveOrOption}
-                changeCheckbox={changeCheckbox}
-                formik={formik}
-              />
-            )}
-            {groupedOptions && (
-              <GroupedChecklistOptions
-                groupedOptions={groupedOptions}
-                previouslySubmittedData={previouslySubmittedData}
-                changeCheckbox={changeCheckbox}
-                formik={formik}
-              />
-            )}
-          </Grid>
-        </ErrorWrapper>
-      </FullWidthWrapper>
-    </Card>
-  );
-};
diff --git a/editor.planx.uk/src/@planx/components/Checklist/Public/tests/Public.test.tsx b/editor.planx.uk/src/@planx/components/Checklist/Public/tests/Public.test.tsx
index 896dfe5d15..cc4a72156b 100644
--- a/editor.planx.uk/src/@planx/components/Checklist/Public/tests/Public.test.tsx
+++ b/editor.planx.uk/src/@planx/components/Checklist/Public/tests/Public.test.tsx
@@ -4,7 +4,7 @@ import { setup } from "testUtils";
 import { vi } from "vitest";
 import { axe } from "vitest-axe";
 
-import { ChecklistLayout } from "../components/VisibleChecklist";
+import { ChecklistLayout } from "../../model";
 import Checklist from "../Public";
 import { groupedOptions, options } from "./mockOptions";
 import { pressContinue, pressOption } from "./testUtils";
@@ -20,7 +20,7 @@ describe("Checklist Component - Grouped Layout", () => {
         text="home type?"
         handleSubmit={handleSubmit}
         groupedOptions={groupedOptions}
-      />
+      />,
     );
 
     await user.click(screen.getByText("Section 1"));
@@ -44,7 +44,7 @@ describe("Checklist Component - Grouped Layout", () => {
         handleSubmit={handleSubmit}
         previouslySubmittedData={{ answers: ["S1_Option1", "S3_Option1"] }}
         groupedOptions={groupedOptions}
-      />
+      />,
     );
 
     expect(screen.getByTestId("group-0-expanded")).toBeTruthy();
@@ -65,7 +65,7 @@ describe("Checklist Component - Grouped Layout", () => {
         description=""
         text="home type?"
         groupedOptions={groupedOptions}
-      />
+      />,
     );
     const results = await axe(container);
     expect(results).toHaveNoViolations();
@@ -81,7 +81,7 @@ describe("Checklist Component - Grouped Layout", () => {
         text="home type?"
         handleSubmit={handleSubmit}
         groupedOptions={groupedOptions}
-      />
+      />,
     );
     const [section1Button, section2Button, section3Button] =
       screen.getAllByRole("button");
@@ -138,7 +138,7 @@ describe("Checklist Component - Basic & Images Layout", () => {
           text="home type?"
           handleSubmit={handleSubmit}
           options={options[type]}
-        />
+        />,
       );
 
       expect(screen.getByRole("heading")).toHaveTextContent("home type?");
@@ -166,7 +166,7 @@ describe("Checklist Component - Basic & Images Layout", () => {
           handleSubmit={handleSubmit}
           previouslySubmittedData={{ answers: ["flat_id", "house_id"] }}
           options={options[type]}
-        />
+        />,
       );
 
       await user.click(screen.getByTestId("continue-button"));
@@ -183,7 +183,7 @@ describe("Checklist Component - Basic & Images Layout", () => {
           description=""
           text="home type?"
           options={options[type]}
-        />
+        />,
       );
       const results = await axe(container);
       expect(results).toHaveNoViolations();
@@ -199,7 +199,7 @@ describe("Checklist Component - Basic & Images Layout", () => {
           text="home type?"
           handleSubmit={handleSubmit}
           options={options[type]}
-        />
+        />,
       );
 
       await user.tab();
diff --git a/editor.planx.uk/src/@planx/components/Checklist/Public/tests/mockOptions.ts b/editor.planx.uk/src/@planx/components/Checklist/Public/tests/mockOptions.ts
index a5fc1a0074..e655712b6b 100644
--- a/editor.planx.uk/src/@planx/components/Checklist/Public/tests/mockOptions.ts
+++ b/editor.planx.uk/src/@planx/components/Checklist/Public/tests/mockOptions.ts
@@ -1,8 +1,6 @@
 import { Option } from "@planx/components/shared";
 
-import { Group } from "../../model";
-import { ChecklistLayout } from "../components/VisibleChecklist";
-
+import { ChecklistLayout, Group } from "../../model";
 
 export const options: {
   [key in ChecklistLayout]?: Array<Option>;
diff --git a/editor.planx.uk/src/@planx/components/Checklist/model.ts b/editor.planx.uk/src/@planx/components/Checklist/model.ts
index 67ab2f694c..0ac307c34c 100644
--- a/editor.planx.uk/src/@planx/components/Checklist/model.ts
+++ b/editor.planx.uk/src/@planx/components/Checklist/model.ts
@@ -1,7 +1,12 @@
 import { array } from "yup";
 
 import { BaseNodeData, Option } from "../shared";
-import { ChecklistLayout } from "./Public/components/VisibleChecklist";
+
+export enum ChecklistLayout {
+  Basic,
+  Grouped,
+  Images,
+}
 
 export interface Group<T> {
   title: string;
@@ -23,6 +28,7 @@ export interface Checklist extends BaseNodeData {
   allRequired?: boolean;
   categories?: Array<Category>;
   neverAutoAnswer?: boolean;
+  autoAnswers?: string[] | undefined;
 }
 
 interface ChecklistExpandableProps {
@@ -31,7 +37,7 @@ interface ChecklistExpandableProps {
 }
 
 export const toggleExpandableChecklist = (
-  checklist: ChecklistExpandableProps
+  checklist: ChecklistExpandableProps,
 ): ChecklistExpandableProps => {
   if (checklist.options !== undefined && checklist.options.length > 0) {
     return {
diff --git a/editor.planx.uk/src/@planx/components/Checklist/types.ts b/editor.planx.uk/src/@planx/components/Checklist/types.ts
index 76ef9d47bd..c06172c321 100644
--- a/editor.planx.uk/src/@planx/components/Checklist/types.ts
+++ b/editor.planx.uk/src/@planx/components/Checklist/types.ts
@@ -1,4 +1,4 @@
-import { BaseNodeData, Option } from "../shared";
+import { BaseNodeData } from "../shared";
 import { PublicProps } from "../shared/types";
 import type { Category, Checklist } from "./model";
 
diff --git a/editor.planx.uk/src/@planx/components/Filter/Editor.tsx b/editor.planx.uk/src/@planx/components/Filter/Editor.tsx
index cffef5eb6b..af9b01c13c 100644
--- a/editor.planx.uk/src/@planx/components/Filter/Editor.tsx
+++ b/editor.planx.uk/src/@planx/components/Filter/Editor.tsx
@@ -3,6 +3,7 @@ import {
   ComponentType as TYPES,
   DEFAULT_FLAG_CATEGORY,
   flatFlags,
+  Node,
 } from "@opensystemslab/planx-core/types";
 import { useFormik } from "formik";
 import React from "react";
@@ -15,6 +16,7 @@ export interface Props {
   id?: string;
   handleSubmit?: (data: any, children?: any) => void;
   node?: any;
+  autoAnswer?: Node["id"];
 }
 
 const Filter: React.FC<Props> = (props) => {
diff --git a/editor.planx.uk/src/@planx/components/Filter/Public.tsx b/editor.planx.uk/src/@planx/components/Filter/Public.tsx
index 44c9ee62ec..4224593eca 100644
--- a/editor.planx.uk/src/@planx/components/Filter/Public.tsx
+++ b/editor.planx.uk/src/@planx/components/Filter/Public.tsx
@@ -1,4 +1,3 @@
-import { useStore } from "pages/FlowEditor/lib/store";
 import { useEffect } from "react";
 
 import { PublicProps } from "../shared/types";
@@ -8,17 +7,12 @@ export type Props = PublicProps<Filter>;
 
 // Filters are always auto-answered and never seen by a user, but should still leave a breadcrumb
 export default function Component(props: Props) {
-  const autoAnswerableFlag = useStore((state) => state.autoAnswerableFlag);
-
-  let idThatCanBeAutoAnswered: string | undefined;
-  if (props.id) idThatCanBeAutoAnswered = autoAnswerableFlag(props.id);
-
   useEffect(() => {
     props.handleSubmit?.({
-      answers: [idThatCanBeAutoAnswered],
+      answers: [props.autoAnswer],
       auto: true,
     });
-  }, []);
+  }, [props.autoAnswer]);
 
   return null;
 }
diff --git a/editor.planx.uk/src/@planx/components/Question/Public/Question.tsx b/editor.planx.uk/src/@planx/components/Question/Public.tsx
similarity index 82%
rename from editor.planx.uk/src/@planx/components/Question/Public/Question.tsx
rename to editor.planx.uk/src/@planx/components/Question/Public.tsx
index 0059e53f2f..696fedbf82 100644
--- a/editor.planx.uk/src/@planx/components/Question/Public/Question.tsx
+++ b/editor.planx.uk/src/@planx/components/Question/Public.tsx
@@ -3,7 +3,6 @@ import FormLabel from "@mui/material/FormLabel";
 import Grid from "@mui/material/Grid";
 import RadioGroup from "@mui/material/RadioGroup";
 import { visuallyHidden } from "@mui/utils";
-import { Edges } from "@opensystemslab/planx-core/types";
 import Card from "@planx/components/shared/Preview/Card";
 import { CardHeader } from "@planx/components/shared/Preview/CardHeader/CardHeader";
 import BasicRadio from "@planx/components/shared/Radio/BasicRadio";
@@ -17,7 +16,7 @@ import FullWidthWrapper from "ui/public/FullWidthWrapper";
 import ErrorWrapper from "ui/shared/ErrorWrapper";
 import { mixed, object, string } from "yup";
 
-import { Question } from "../model";
+import { Question } from "./model";
 
 export enum QuestionLayout {
   Basic,
@@ -26,48 +25,11 @@ export enum QuestionLayout {
 }
 
 const QuestionComponent: React.FC<Question> = (props) => {
-  const [flow, autoAnswerableOptions] = useStore((state) => [
-    state.flow,
-    state.autoAnswerableOptions,
-  ]);
+  // Questions without edges act like "sticky notes" in the graph for editors only & should be auto-answered
+  const flow = useStore().flow;
+  const edges = props.id ? flow[props.id]?.edges : undefined;
+  const isStickyNote = !edges || edges.length === 0;
 
-  if (props.neverAutoAnswer) {
-    return <VisibleQuestion {...props} />;
-  }
-
-  // Questions without edges act like "sticky notes" in the graph for editors only & can be immediately auto-answered
-  let edges: Edges | undefined;
-  if (props.id) edges = flow[props.id]?.edges;
-  if (!edges || edges.length === 0) {
-    return <AutoAnsweredQuestion {...props} answerIds={undefined} />;
-  }
-
-  let idsThatCanBeAutoAnswered: string[] | undefined;
-  if (props.id) idsThatCanBeAutoAnswered = autoAnswerableOptions(props.id);
-  if (idsThatCanBeAutoAnswered) {
-    return (
-      <AutoAnsweredQuestion {...props} answerIds={idsThatCanBeAutoAnswered} />
-    );
-  }
-
-  return <VisibleQuestion {...props} />;
-};
-
-// An auto-answered Question won't be seen by the user, but still leaves a breadcrumb
-const AutoAnsweredQuestion: React.FC<
-  Question & { answerIds: string[] | undefined }
-> = (props) => {
-  useEffect(() => {
-    props.handleSubmit?.({
-      answers: props.answerIds,
-      auto: true,
-    });
-  }, []);
-
-  return null;
-};
-
-const VisibleQuestion: React.FC<Question> = (props) => {
   const previousResponseId = props?.previouslySubmittedData?.answers?.[0];
   const previousResponseKey = props.responses.find(
     (response) => response.id === previousResponseId,
@@ -104,6 +66,21 @@ const VisibleQuestion: React.FC<Question> = (props) => {
     layout = QuestionLayout.Descriptions;
   }
 
+  // Auto-answered Questions still set a breadcrumb even though they render null
+  useEffect(() => {
+    if (isStickyNote || props.autoAnswers) {
+      props.handleSubmit?.({
+        answers: props.autoAnswers,
+        auto: true,
+      });
+    }
+  }, [isStickyNote, props.autoAnswers]);
+
+  // Auto-answered Questions are not publicly visible
+  if (isStickyNote || props.autoAnswers) {
+    return null;
+  }
+
   return (
     <Card handleSubmit={formik.handleSubmit}>
       <CardHeader
diff --git a/editor.planx.uk/src/@planx/components/Question/Public/Question.fixture.tsx b/editor.planx.uk/src/@planx/components/Question/Public/Question.fixture.tsx
deleted file mode 100644
index 3587c675ee..0000000000
--- a/editor.planx.uk/src/@planx/components/Question/Public/Question.fixture.tsx
+++ /dev/null
@@ -1,28 +0,0 @@
-import React from "react";
-
-import Question from "./Question";
-
-export default (
-  <Question
-    text="To be a (murderer) or not to be"
-    description="That is the question"
-    info="Some info here"
-    policyRef="Policy ref here"
-    howMeasured="How is it measured"
-    responses={[
-      {
-        id: "a",
-        responseKey: "a",
-        title: "Yes",
-        description: "Yes, I'll be a murderer",
-      },
-      {
-        id: "b",
-        responseKey: "b",
-        title: "No",
-        description: "No, I shan't",
-      },
-    ]}
-    handleSubmit={window.alert}
-  />
-);
diff --git a/editor.planx.uk/src/@planx/components/Question/Public/package.json b/editor.planx.uk/src/@planx/components/Question/Public/package.json
deleted file mode 100644
index 050f535db6..0000000000
--- a/editor.planx.uk/src/@planx/components/Question/Public/package.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  "main": "Question.tsx"
-}
diff --git a/editor.planx.uk/src/@planx/components/Question/Public/Question.stories.tsx b/editor.planx.uk/src/@planx/components/Question/Question.stories.tsx
similarity index 98%
rename from editor.planx.uk/src/@planx/components/Question/Public/Question.stories.tsx
rename to editor.planx.uk/src/@planx/components/Question/Question.stories.tsx
index 8b02fc879f..f0381f338e 100644
--- a/editor.planx.uk/src/@planx/components/Question/Public/Question.stories.tsx
+++ b/editor.planx.uk/src/@planx/components/Question/Question.stories.tsx
@@ -1,6 +1,6 @@
 import { Meta, StoryObj } from "@storybook/react";
 
-import Question from "./Question";
+import Question from "./Public";
 
 const meta = {
   title: "PlanX Components/Question",
diff --git a/editor.planx.uk/src/@planx/components/Question/model.ts b/editor.planx.uk/src/@planx/components/Question/model.ts
index c5aef4d74a..15f88308f3 100644
--- a/editor.planx.uk/src/@planx/components/Question/model.ts
+++ b/editor.planx.uk/src/@planx/components/Question/model.ts
@@ -18,4 +18,5 @@ export interface Question extends BaseNodeData {
   }[];
   previouslySubmittedData?: Store.UserData;
   handleSubmit: HandleSubmit;
+  autoAnswers?: string[] | undefined;
 }
diff --git a/editor.planx.uk/src/pages/Preview/Node.tsx b/editor.planx.uk/src/pages/Preview/Node.tsx
index fe30ad7cec..7418199ece 100644
--- a/editor.planx.uk/src/pages/Preview/Node.tsx
+++ b/editor.planx.uk/src/pages/Preview/Node.tsx
@@ -75,10 +75,18 @@ interface Props {
 }
 
 const Node: React.FC<Props> = (props) => {
-  const [childNodesOf, resetPreview, cachedBreadcrumbs] = useStore((state) => [
+  const [
+    childNodesOf,
+    resetPreview,
+    cachedBreadcrumbs,
+    autoAnswerableFlag,
+    autoAnswerableOptions,
+  ] = useStore((state) => [
     state.childNodesOf,
     state.resetPreview,
     state.cachedBreadcrumbs,
+    state.autoAnswerableFlag,
+    state.autoAnswerableOptions,
   ]);
 
   const handleSubmit = props.handleSubmit;
@@ -96,14 +104,18 @@ const Node: React.FC<Props> = (props) => {
   });
 
   switch (props.node.type) {
+    case TYPES.AddressInput:
+      return <AddressInputComponent {...getComponentProps<AddressInput>()} />;
+
     case TYPES.Calculate:
       return <CalculateComponent {...getComponentProps<Calculate>()} />;
 
     case TYPES.Checklist: {
       const checklistProps = getComponentProps<Checklist>();
       const childNodes = childNodesOf(
-        props.node.id,
+        nodeId,
       ) as (typeof checklistProps)["options"];
+      const autoAnswers = nodeId ? autoAnswerableOptions(nodeId) : undefined;
 
       return (
         <ChecklistComponent
@@ -128,6 +140,7 @@ const Node: React.FC<Props> = (props) => {
                   checklistProps.categories,
                 )[1]
           }
+          autoAnswers={autoAnswers}
         />
       );
     }
@@ -135,6 +148,9 @@ const Node: React.FC<Props> = (props) => {
     case TYPES.Confirmation:
       return <ConfirmationComponent {...getComponentProps<Confirmation>()} />;
 
+    case TYPES.ContactInput:
+      return <ContactInputComponent {...getComponentProps<ContactInput>()} />;
+
     case TYPES.Content:
       return <ContentComponent {...getComponentProps<Content>()} />;
 
@@ -143,8 +159,10 @@ const Node: React.FC<Props> = (props) => {
 
     case TYPES.DrawBoundary:
       return <DrawBoundaryComponent {...getComponentProps<DrawBoundary>()} />;
+
     case TYPES.Feedback:
       return <FeedbackComponent {...getComponentProps<Feedback>()} />;
+
     case TYPES.FileUpload:
       return <FileUploadComponent {...getComponentProps<FileUpload>()} />;
 
@@ -155,6 +173,13 @@ const Node: React.FC<Props> = (props) => {
         />
       );
 
+    case TYPES.Filter: {
+      const filterProps = getComponentProps<Filter>();
+      const autoAnswer = nodeId ? autoAnswerableFlag(nodeId) : undefined;
+
+      return <FilterComponent {...filterProps} autoAnswer={autoAnswer} />;
+    }
+
     case TYPES.FindProperty:
       return <FindPropertyComponent {...getComponentProps<FindProperty>()} />;
 
@@ -179,6 +204,38 @@ const Node: React.FC<Props> = (props) => {
     case TYPES.Pay:
       return <PayComponent {...getComponentProps<Pay>()} />;
 
+    case TYPES.PlanningConstraints:
+      return (
+        <PlanningConstraintsComponent
+          {...getComponentProps<PlanningConstraints>()}
+        />
+      );
+
+    case TYPES.PropertyInformation:
+      return (
+        <PropertyInformationComponent
+          {...getComponentProps<PropertyInformation>()}
+        />
+      );
+
+    case TYPES.Question: {
+      const questionProps = getComponentProps<Question>();
+      const autoAnswers = nodeId ? autoAnswerableOptions(nodeId) : undefined;
+
+      return (
+        <QuestionComponent
+          {...questionProps}
+          responses={childNodesOf(nodeId).map((n, i) => ({
+            id: n.id,
+            responseKey: i + 1,
+            title: n.data?.text,
+            ...n.data,
+          }))}
+          autoAnswers={autoAnswers}
+        />
+      );
+    }
+
     case TYPES.Result:
       return <ResultComponent {...getComponentProps<Result>()} />;
 
@@ -194,19 +251,6 @@ const Node: React.FC<Props> = (props) => {
     case TYPES.SetValue:
       return <SetValueComponent {...getComponentProps<SetValue>()} />;
 
-    case TYPES.Question:
-      return (
-        <QuestionComponent
-          {...getComponentProps<Question>()}
-          responses={childNodesOf(props.node.id).map((n, i) => ({
-            id: n.id,
-            responseKey: i + 1,
-            title: n.data?.text,
-            ...n.data,
-          }))}
-        />
-      );
-
     case TYPES.TaskList: {
       const taskListProps = getComponentProps<TaskList>();
 
@@ -221,34 +265,11 @@ const Node: React.FC<Props> = (props) => {
     case TYPES.TextInput:
       return <TextInputComponent {...getComponentProps<TextInput>()} />;
 
-    case TYPES.AddressInput:
-      return <AddressInputComponent {...getComponentProps<AddressInput>()} />;
-
-    case TYPES.ContactInput:
-      return <ContactInputComponent {...getComponentProps<ContactInput>()} />;
-
-    case TYPES.PlanningConstraints:
-      return (
-        <PlanningConstraintsComponent
-          {...getComponentProps<PlanningConstraints>()}
-        />
-      );
-
-    case TYPES.PropertyInformation:
-      return (
-        <PropertyInformationComponent
-          {...getComponentProps<PropertyInformation>()}
-        />
-      );
-
-    case TYPES.Filter:
-      return <FilterComponent {...getComponentProps<Filter>()} />;
-
     // These types are never seen by users, nor do they leave their own breadcrumbs entry
+    case TYPES.Answer:
     case TYPES.ExternalPortal:
     case TYPES.Flow:
     case TYPES.InternalPortal:
-    case TYPES.Answer:
     case undefined:
       return null;