diff --git a/src/components/tutor/ThirdStep.vue b/src/components/tutor/ThirdStep.vue
index 6b8a775..a17cfad 100644
--- a/src/components/tutor/ThirdStep.vue
+++ b/src/components/tutor/ThirdStep.vue
@@ -9,8 +9,9 @@ const props = defineProps<{
   action: () => {};
   actionText?: string;
   disabled: boolean;
-  updateSyllabus: () => void;
+  updateSyllabus: (content: string) => void;
   restart: () => void;
+  updateSyllabusInDB: () => void;
 }>();
 
 const isEditable: Ref<boolean> = ref(false);
@@ -26,9 +27,17 @@ const toggleFeedback = async () => {
   enableFeedback.value = !enableFeedback.value;
 };
 
-const handleTextEdit = (event, index) => {
+const handleTextEdit = (event) => {
   const newValue = event.target.innerText;
-  props.updateSyllabus(index, newValue);
+  props.updateSyllabus(newValue);
+};
+
+const handleSyllabusEdition = () => {
+  if (isEditable.value) {
+    // Save the edited syllabus
+    props.updateSyllabusInDB();
+  }
+  isEditable.value = !isEditable.value;
 };
 </script>
 <template>
@@ -40,7 +49,7 @@ const handleTextEdit = (event, index) => {
     <!-- syllabus -->
 
     <div class="is-flex is-flex-direction-column">
-      <button class="button is-white ml-auto" @click="isEditable = !isEditable">
+      <button class="button is-white ml-auto" @click="handleSyllabusEdition">
         <span class="icon is-small mr-2">
           <EditIcon />
         </span>
@@ -54,7 +63,7 @@ const handleTextEdit = (event, index) => {
           class="syllabus content"
           v-if="syllabus?.content"
           v-html="marked.parse(syllabus?.content)"
-          @blur="handleTextEdit($event, index)"
+          @blur="handleTextEdit($event)"
           @click="isEditable = true"
         />
       </div>
diff --git a/src/stores/featureFlip.ts b/src/stores/featureFlip.ts
index f9340ff..5c2b98f 100644
--- a/src/stores/featureFlip.ts
+++ b/src/stores/featureFlip.ts
@@ -18,7 +18,7 @@ export const useFeatureFlipStore = defineStore('featureFlip', () => {
   };
 
   const isWorkshopFeatureEnabled = () => {
-    return isDevEnvironment || window.location.href.includes('workshop');
+    return isDevEnvironment;
   };
 
   return {
diff --git a/src/stores/metrics.ts b/src/stores/metrics.ts
index a9e84bd..6eab0b9 100644
--- a/src/stores/metrics.ts
+++ b/src/stores/metrics.ts
@@ -27,12 +27,24 @@ export const useMetricsStore = defineStore('metrics', () => {
       return;
     }
 
-    if (!isInPage('q-and-a')) {
+    let storageKey;
+
+    if (isInPage('q-and-a')) {
+      storageKey = 'chatMessageId';
+    }
+    if (isInPage('tutor')) {
+      storageKey = 'tutorMessageId';
+    }
+    if (isInPage('search')) {
+      storageKey = 'searchMessageId';
+    }
+
+    if (!storageKey) {
       return;
     }
-    // get message id from storage
-    const messageId = localStorage.getItem('chatMessageId');
 
+    // get message id from storage
+    const messageId = localStorage.getItem(storageKey);
     if (!messageId || !docId) {
       return;
     }
diff --git a/src/stores/search.ts b/src/stores/search.ts
index 5fb8f82..bb80438 100644
--- a/src/stores/search.ts
+++ b/src/stores/search.ts
@@ -46,10 +46,14 @@ export const useSearchStore = defineStore('search', () => {
       ];
       const [sdgsFromQuery, { data, status }] = await Promise.all(promises);
 
-      sdgsQuery.value = sdgsFromQuery;
+      sdgsQuery.value = sdgsFromQuery as string[];
 
       isFetchingSources.value = false;
-      searchResults.value = data;
+      searchResults.value = data.length ? data : data.docs;
+
+      if (data?.search_message_id) {
+        localStorage.setItem('searchMessageId', data.search_message_id);
+      }
 
       if (status === 206) {
         hasPartialResult.value = true;
diff --git a/src/stores/tutor.ts b/src/stores/tutor.ts
index 46a8ab4..2e51666 100644
--- a/src/stores/tutor.ts
+++ b/src/stores/tutor.ts
@@ -90,8 +90,11 @@ export const useTutorStore = defineStore('tutor', () => {
     summaries.value[index] = content;
   };
 
-  const updateSyllabus = (index, content) => {
-    syllabi.value[index] = content;
+  const updateSyllabus = (content: string) => {
+    if (!syllabi.value) {
+      return;
+    }
+    syllabi.value = { ...syllabi.value, content };
   };
 
   const syllabusLanguage: Ref<string> = ref(i18n.global.locale.value);
@@ -321,6 +324,26 @@ export const useTutorStore = defineStore('tutor', () => {
     }
     const docxContent = await convertMarkdownToDocx(syllabi.value.content);
     downloadDocx(docxContent, 'syllabus.docx');
+    try {
+      await postAxios('/metric/syllabus_downloaded');
+    } catch (error) {
+      console.error('Error during metrics update:', error);
+    }
+  };
+
+  const updateSyllabusInDB = async () => {
+    if (!syllabi.value || !syllabi.value.content) {
+      console.error('No syllabi available for download');
+      return;
+    }
+
+    try {
+      await postAxios('/tutor/syllabus/user_update', {
+        syllabus: syllabi.value.content
+      });
+    } catch (error) {
+      console.error('Error during syllabus update:', error);
+    }
   };
 
   return {
@@ -359,6 +382,7 @@ export const useTutorStore = defineStore('tutor', () => {
     summaries,
     newFilesToSearch,
     stopAction,
-    updateSyllabus
+    updateSyllabus,
+    updateSyllabusInDB
   };
 });
diff --git a/src/views/TutorPage.vue b/src/views/TutorPage.vue
index b1ffb52..820c446 100644
--- a/src/views/TutorPage.vue
+++ b/src/views/TutorPage.vue
@@ -111,6 +111,7 @@ const stepToAction: Record<1 | 2 | 3 | 4, (arg?: any) => Promise<void>> = {
         :giveFeedback="store.giveFeedback"
         :action="stepToAction[4]"
         :restart="store.restart"
+        :updateSyllabusInDB="store.updateSyllabusInDB"
       />
     </div>
   </div>