diff --git a/src/components/Card/PlanLessonCard.tsx b/src/components/Card/PlanLessonCard.tsx
index 798bda3a..8b28ecf4 100644
--- a/src/components/Card/PlanLessonCard.tsx
+++ b/src/components/Card/PlanLessonCard.tsx
@@ -27,6 +27,7 @@ type FlowCardProps = {
   px?: SpaceProps['px'];
   id: number;
   isSelected: boolean;
+  suggestedType: string;
   setSelectedNode: (id: number) => void;
   updateNodeAt: (id: number, updatedNode: PlanLessonNode) => void;
 };
@@ -45,13 +46,13 @@ const PlanLessonCard = ({
   setSelectedNode,
   isSelected,
   updateNodeAt,
+  suggestedType,
 }: FlowCardProps) => {
   const [specificData, setSpecificData] = useState<SpecificData>({
     solutions_number: 1,
     distractors_number: 1,
     easily_discardable_distractors_number: 1,
   });
-
   const planNodeSuggestedType = planNode.type;
 
   useEffect(() => {
@@ -79,7 +80,7 @@ const PlanLessonCard = ({
                 <strong>Topic:</strong> {planNode.topic}
               </Text>
               <Text fontSize="sm">
-                <strong>Type:</strong> {planNode.type}
+                <strong>Suggested Type:</strong> {suggestedType}
               </Text>
               <Text fontSize="sm">
                 <strong>Details:</strong> {planNode.details}
diff --git a/src/components/Modals/AIToolModal.tsx b/src/components/Modals/AIToolModal.tsx
index 15e8da8e..83737c8a 100644
--- a/src/components/Modals/AIToolModal.tsx
+++ b/src/components/Modals/AIToolModal.tsx
@@ -411,7 +411,7 @@ const AIToolModal = ({
                       break;
                     case 'short answer question':
                       adaptedData = {
-                        question: dataGen.assignment,
+                        question: dataGen.assignment + ' ' + dataGen.plus,
                         correctAnswers: dataGen.solutions,
                       };
                       break;
diff --git a/src/components/Modals/CreateAILPModal.tsx b/src/components/Modals/CreateAILPModal.tsx
index d2ca88da..458d93d9 100644
--- a/src/components/Modals/CreateAILPModal.tsx
+++ b/src/components/Modals/CreateAILPModal.tsx
@@ -77,7 +77,7 @@ const dataFactory: Record<string, (values: AIExerciseGenerated) => any> = {
     possibleAnswer: values.solutions[0],
   }),
   closeEndedQuestionNode: (values) => ({
-    question: values.assignment,
+    question: values.assignment + ' ' + values.plus,
     correctAnswers: values.solutions,
     isAnswerCorrect: [],
   }),
@@ -539,7 +539,7 @@ const CreateAILPModal = ({ isOpen, onClose, action }: ModaTemplateProps) => {
                 if (!learningOutcome || !eduLevel) {
                   throw new Error('Missing learningOutcome or eduLevel');
                 }
-                API.planLesson({
+                await API.planLesson({
                   topics: selectedTopic,
                   learning_outcome: learningOutcome,
                   language: analysedMaterial.language,
@@ -717,16 +717,20 @@ const CreateAILPModal = ({ isOpen, onClose, action }: ModaTemplateProps) => {
         <ModalBody hidden={!screen3}>
           <FormControl label="Nodes">
             <Box display="flex" flexDirection="column">
-              {AINodes?.nodes.map((node, id) => (
-                <PlanLessonCard
-                  planNode={node}
-                  key={id}
-                  id={id}
-                  setSelectedNode={handleToggleNode}
-                  isSelected={selectedNodeIds.includes(id)}
-                  updateNodeAt={updateNodeAt}
-                />
-              ))}
+              {AINodes?.nodes.map((node, id) => {
+                const suggestedType = node.type;
+                return (
+                  <PlanLessonCard
+                    planNode={node}
+                    key={id}
+                    id={id}
+                    setSelectedNode={handleToggleNode}
+                    isSelected={selectedNodeIds.includes(id)}
+                    updateNodeAt={updateNodeAt}
+                    suggestedType={suggestedType}
+                  />
+                );
+              })}
             </Box>
           </FormControl>
           <Button
diff --git a/src/components/Properties/Edges/EdgeProperties.tsx b/src/components/Properties/Edges/EdgeProperties.tsx
index 6de5e16a..5b249e8b 100644
--- a/src/components/Properties/Edges/EdgeProperties.tsx
+++ b/src/components/Properties/Edges/EdgeProperties.tsx
@@ -19,7 +19,7 @@ const config = [
       'CreateKeywordsListNode',
       'MemoriseKeywordsListNode',
       'PromptEngineeringNode',
-      'ProblemSolvingNode',
+      'ProblemSolvingNode',      
     ],
   },
   {
diff --git a/src/pages/flows/[id]/index.tsx b/src/pages/flows/[id]/index.tsx
index 81896901..c1c5cf97 100644
--- a/src/pages/flows/[id]/index.tsx
+++ b/src/pages/flows/[id]/index.tsx
@@ -20,6 +20,7 @@ import { APIV2 } from '../../../data/api';
 import useStore from '../../../store';
 import { PolyglotFlow } from '../../../types/polyglotElements';
 import auth0 from '../../../utils/auth0';
+import { clearFlowCaches } from '../../../utils/cache';
 
 type FlowIndexProps = {
   accessToken: string | undefined;
@@ -66,6 +67,7 @@ const FlowIndex = ({ accessToken }: FlowIndexProps) => {
           });
         if (returnPath) router.push(returnPath);
         storeState.updateFlowInfo(response.data);
+        clearFlowCaches(response.data._id);
       } else {
         outputToast &&
           toast({
diff --git a/src/utils/cache.ts b/src/utils/cache.ts
new file mode 100644
index 00000000..a9aaec1a
--- /dev/null
+++ b/src/utils/cache.ts
@@ -0,0 +1,8 @@
+export function clearFlowCaches(flowId: string) {
+  try {
+    localStorage.removeItem('flow');
+    localStorage.removeItem('rescue-' + flowId);
+  } catch (error) {
+    console.warn('Failed to clear flow caches', error);
+  }
+}
diff --git a/src/utils/utils.ts b/src/utils/utils.ts
index 94062783..d5e133fb 100644
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@@ -91,6 +91,7 @@ const configUnconditionalEdge = [
   'lessonTextNode',
   'WatchVideoNode',
   'ReadMaterialNode',
+  'ScanningNode',
   'MindMapNode',
   'SummaryNode',
   'ProblemSolvingNode',