diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/profile/EditAvatar.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/profile/EditAvatar.tsx
index cfe31eade3..71cd2f305c 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/profile/EditAvatar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/profile/EditAvatar.tsx
@@ -5,7 +5,7 @@ import { Button, ProfileAvatar } from "@formbricks/ui";
 import Image from "next/image";
 import { Session } from "next-auth";
 
-export function EditAvatar({ session }:{session: Session | null}) {
+export function EditAvatar({ session }: { session: Session | null }) {
   return (
     <div>
       {session?.user?.image ? (
diff --git a/apps/web/app/(app)/environments/[environmentId]/settings/profile/EditName.tsx b/apps/web/app/(app)/environments/[environmentId]/settings/profile/EditName.tsx
index 2db1dc360c..97e8e5f45a 100644
--- a/apps/web/app/(app)/environments/[environmentId]/settings/profile/EditName.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/settings/profile/EditName.tsx
@@ -7,18 +7,17 @@ import { profileEditAction } from "./actions";
 import { TProfile } from "@formbricks/types/v1/profile";
 
 export function EditName({ profile }: { profile: TProfile }) {
-
   const {
     register,
     handleSubmit,
     formState: { isSubmitting },
-  } = useForm<{name:string}>()
+  } = useForm<{ name: string }>();
 
   return (
     <>
       <form
         className="w-full max-w-sm items-center"
-        onSubmit={handleSubmit(async(data) => {
+        onSubmit={handleSubmit(async (data) => {
           try {
             await profileEditAction(profile.id, data);
             toast.success("Your name was updated successfully.");
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/QuestionFilterComboBox.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/QuestionFilterComboBox.tsx
index 8c10ec1fce..c9d11dbb87 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/QuestionFilterComboBox.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/QuestionFilterComboBox.tsx
@@ -14,7 +14,6 @@ import {
 import useClickOutside from "@formbricks/lib/useClickOutside";
 import { ChevronDown, ChevronUp, X } from "lucide-react";
 import { QuestionType } from "@formbricks/types/questions";
-import { isArray } from "lodash";
 import clsx from "clsx";
 
 type QuestionFilterComboBoxProps = {
@@ -150,7 +149,7 @@ const QuestionFilterComboBox = ({
                       !isMultiple
                         ? onChangeFilterComboBoxValue(o)
                         : onChangeFilterComboBoxValue(
-                            isArray(filterComboBoxValue) ? [...filterComboBoxValue, o] : [o]
+                            Array.isArray(filterComboBoxValue) ? [...filterComboBoxValue, o] : [o]
                           );
                       !isMultiple && setOpen(false);
                     }}
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx
index 1777c2ff04..c994d0f6eb 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyEditor.tsx
@@ -29,11 +29,9 @@ export default function SurveyEditor({ environmentId, surveyId }: SurveyEditorPr
 
   useEffect(() => {
     if (survey) {
-      if (!localSurvey) {
-        setLocalSurvey(survey);
-      }
+      setLocalSurvey(survey);
 
-      if (!activeQuestionId && survey.questions.length > 0) {
+      if (survey.questions.length > 0) {
         setActiveQuestionId(survey.questions[0].id);
       }
     }
diff --git a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
index 8b924f8a32..91cf2b16fe 100644
--- a/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
+++ b/apps/web/app/(app)/environments/[environmentId]/surveys/[surveyId]/edit/SurveyMenuBar.tsx
@@ -65,7 +65,8 @@ export default function SurveyMenuBar({
 
   // write a function which updates the local survey status
   const updateLocalSurveyStatus = (status: Survey["status"]) => {
-    const updatedSurvey = { ...localSurvey, status };
+    const updatedSurvey = JSON.parse(JSON.stringify(localSurvey));
+    updatedSurvey.status = status;
     setLocalSurvey(updatedSurvey);
   };
 
diff --git a/apps/web/components/preview/MultipleChoiceMultiQuestion.tsx b/apps/web/components/preview/MultipleChoiceMultiQuestion.tsx
index 1285043a77..916b3be189 100644
--- a/apps/web/components/preview/MultipleChoiceMultiQuestion.tsx
+++ b/apps/web/components/preview/MultipleChoiceMultiQuestion.tsx
@@ -1,14 +1,14 @@
-import { Input } from "@formbricks/ui";
+import { BackButton } from "@/components/preview/BackButton";
 import SubmitButton from "@/components/preview/SubmitButton";
 import { shuffleArray } from "@/lib/utils";
 import { cn } from "@formbricks/lib/cn";
+import { symmetricDifference } from "@formbricks/lib/utils/array";
+import { Response } from "@formbricks/types/js";
 import type { Choice, MultipleChoiceMultiQuestion } from "@formbricks/types/questions";
+import { Input } from "@formbricks/ui";
 import { useEffect, useState } from "react";
 import Headline from "./Headline";
 import Subheader from "./Subheader";
-import _ from "lodash";
-import { Response } from "@formbricks/types/js";
-import { BackButton } from "@/components/preview/BackButton";
 
 interface MultipleChoiceMultiProps {
   question: MultipleChoiceMultiQuestion;
@@ -80,7 +80,7 @@ export default function MultipleChoiceMultiQuestion({
       [question.id]: selectedChoices,
     };
 
-    if (_.xor(selectedChoices, storedResponseValue).length === 0) {
+    if (storedResponseValue && symmetricDifference(selectedChoices, storedResponseValue).length === 0) {
       goToNextQuestion(data);
       return;
     }
diff --git a/apps/web/components/shared/EmptySpaceFiller.tsx b/apps/web/components/shared/EmptySpaceFiller.tsx
index b2b362f736..72f48e53f3 100644
--- a/apps/web/components/shared/EmptySpaceFiller.tsx
+++ b/apps/web/components/shared/EmptySpaceFiller.tsx
@@ -30,7 +30,7 @@ const EmptySpaceFiller: React.FC<EmptySpaceFillerProps> = ({
         <div className="w-full space-y-4 rounded-b-lg bg-white p-4">
           <div className="h-16 w-full rounded-lg bg-slate-100"></div>
 
-          <div className="flex flex-col h-16 w-full items-center justify-center rounded-lg bg-slate-50 text-slate-700 transition-all duration-300 ease-in-out hover:bg-slate-100 ">
+          <div className="flex h-16 w-full flex-col items-center justify-center rounded-lg bg-slate-50 text-slate-700 transition-all duration-300 ease-in-out hover:bg-slate-100 ">
             {!environment.widgetSetupCompleted && !noWidgetRequired && (
               <Link
                 className="flex w-full items-center justify-center"
diff --git a/apps/web/components/shared/GoBackButton.tsx b/apps/web/components/shared/GoBackButton.tsx
index 332683eec7..34b04685c3 100644
--- a/apps/web/components/shared/GoBackButton.tsx
+++ b/apps/web/components/shared/GoBackButton.tsx
@@ -1,4 +1,4 @@
-'use client';
+"use client";
 
 import { BackIcon } from "@formbricks/ui";
 import { useRouter } from "next/navigation";
diff --git a/apps/web/lib/surveys/surveys.ts b/apps/web/lib/surveys/surveys.ts
index b04bf024b0..fa21a2d564 100644
--- a/apps/web/lib/surveys/surveys.ts
+++ b/apps/web/lib/surveys/surveys.ts
@@ -1,20 +1,19 @@
-import useSWR from "swr";
-import { fetcher } from "@formbricks/lib/fetcher";
-import { TSurvey } from "@formbricks/types/v1/surveys";
-import { TResponse } from "@formbricks/types/v1/responses";
+import {
+  DateRange,
+  SelectedFilterValue,
+} from "@/app/(app)/environments/[environmentId]/ResponseFilterContext";
 import {
   OptionsType,
   QuestionOptions,
 } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/QuestionsComboBox";
 import { QuestionFilterOptions } from "@/app/(app)/environments/[environmentId]/surveys/[surveyId]/ResponseFilter";
+import { fetcher } from "@formbricks/lib/fetcher";
 import { QuestionType } from "@formbricks/types/questions";
+import { TResponse } from "@formbricks/types/v1/responses";
+import { TSurvey } from "@formbricks/types/v1/surveys";
 import { TTag } from "@formbricks/types/v1/tags";
-import {
-  DateRange,
-  SelectedFilterValue,
-} from "@/app/(app)/environments/[environmentId]/ResponseFilterContext";
-import { isArray } from "lodash";
 import { isWithinInterval } from "date-fns";
+import useSWR from "swr";
 
 export const useSurveys = (environmentId: string) => {
   const { data, error, mutate, isLoading } = useSWR(`/api/v1/environments/${environmentId}/surveys`, fetcher);
@@ -404,7 +403,7 @@ export const getFilterResponses = (
               if (question) {
                 const responseValue = response.data[question.id];
                 const filterValue = filter?.filterType?.filterComboBoxValue;
-                if (isArray(responseValue) && isArray(filterValue) && filterValue.length > 0) {
+                if (Array.isArray(responseValue) && Array.isArray(filterValue) && filterValue.length > 0) {
                   //@ts-ignore
                   const updatedResponseValue = question?.choices
                     ? //@ts-ignore
@@ -435,7 +434,7 @@ export const getFilterResponses = (
                 const filterValue = filter?.filterType?.filterComboBoxValue;
                 if (
                   filter?.filterType?.filterValue === "Includes either" &&
-                  isArray(filterValue) &&
+                  Array.isArray(filterValue) &&
                   filterValue.length > 0 &&
                   typeof responseValue === "string"
                 ) {
diff --git a/packages/js/src/components/MultipleChoiceMultiQuestion.tsx b/packages/js/src/components/MultipleChoiceMultiQuestion.tsx
index 8913a72c2b..348ec17526 100644
--- a/packages/js/src/components/MultipleChoiceMultiQuestion.tsx
+++ b/packages/js/src/components/MultipleChoiceMultiQuestion.tsx
@@ -6,8 +6,8 @@ import { cn, shuffleArray } from "../lib/utils";
 import Headline from "./Headline";
 import Subheader from "./Subheader";
 import SubmitButton from "./SubmitButton";
-import _ from "lodash";
 import { BackButton } from "./BackButton";
+import { symmetricDifference } from "../../../lib/utils/array";
 
 interface MultipleChoiceMultiProps {
   question: TSurveyMultipleChoiceMultiQuestion;
@@ -91,7 +91,7 @@ export default function MultipleChoiceMultiQuestion({
       [question.id]: selectedChoices,
     };
 
-    if (_.xor(selectedChoices, storedResponseValue).length === 0) {
+    if (symmetricDifference(selectedChoices, storedResponseValue).length === 0) {
       goToNextQuestion(data);
       return;
     }
diff --git a/packages/js/src/components/MultipleChoiceSingleQuestion.tsx b/packages/js/src/components/MultipleChoiceSingleQuestion.tsx
index 7fae48eca5..42490530ef 100644
--- a/packages/js/src/components/MultipleChoiceSingleQuestion.tsx
+++ b/packages/js/src/components/MultipleChoiceSingleQuestion.tsx
@@ -109,7 +109,7 @@ export default function MultipleChoiceSingleQuestion({
                   selectedChoice === choice.label
                     ? "fb-z-10 fb-bg-slate-50 fb-border-slate-400"
                     : "fb-border-gray-200",
-                  "fb-relative fb-flex fb-cursor-pointer fb-flex-col fb-rounded-md fb-border fb-p-4 focus:fb-outline-none hover:bg-slate-50 fb-text-slate-800"
+                  "fb-relative fb-flex fb-cursor-pointer fb-flex-col fb-rounded-md fb-border fb-p-4 focus:fb-outline-none fb-text-slate-800 hover:bg-slate-50"
                 )}>
                 <span className="fb-flex fb-items-center fb-text-sm">
                   <input
diff --git a/packages/lib/utils/array.ts b/packages/lib/utils/array.ts
new file mode 100644
index 0000000000..f1be591094
--- /dev/null
+++ b/packages/lib/utils/array.ts
@@ -0,0 +1,3 @@
+export function symmetricDifference<T>(arr1: T[], arr2: T[]): T[] {
+  return arr1.filter((x) => !arr2.includes(x)).concat(arr2.filter((x) => !arr1.includes(x)));
+}
diff --git a/packages/ui/index.tsx b/packages/ui/index.tsx
index 8c4701a85d..ccffcd28da 100644
--- a/packages/ui/index.tsx
+++ b/packages/ui/index.tsx
@@ -16,7 +16,7 @@ export {
   CommandItem,
   CommandList,
   CommandSeparator,
-  CommandShortcut
+  CommandShortcut,
 } from "./components/Command";
 export { Confetti } from "./components/Confetti";
 export { DatePicker } from "./components/DatePicker";
@@ -27,13 +27,24 @@ export {
   DialogFooter,
   DialogHeader,
   DialogTitle,
-  DialogTrigger
+  DialogTrigger,
 } from "./components/Dialog";
 export {
-  DropdownMenu, DropdownMenuCheckboxItem, DropdownMenuContent, DropdownMenuGroup, DropdownMenuItem, DropdownMenuLabel, DropdownMenuPortal, DropdownMenuRadioGroup, DropdownMenuRadioItem, DropdownMenuSeparator,
-  DropdownMenuShortcut, DropdownMenuSub,
+  DropdownMenu,
+  DropdownMenuCheckboxItem,
+  DropdownMenuContent,
+  DropdownMenuGroup,
+  DropdownMenuItem,
+  DropdownMenuLabel,
+  DropdownMenuPortal,
+  DropdownMenuRadioGroup,
+  DropdownMenuRadioItem,
+  DropdownMenuSeparator,
+  DropdownMenuShortcut,
+  DropdownMenuSub,
   DropdownMenuSubContent,
-  DropdownMenuSubTrigger, DropdownMenuTrigger
+  DropdownMenuSubTrigger,
+  DropdownMenuTrigger,
 } from "./components/DropdownMenu";
 export { ErrorComponent } from "./components/ErrorComponent";
 export { Input } from "./components/Input";
@@ -45,7 +56,14 @@ export { RadioGroup, RadioGroupItem } from "./components/RadioGroup";
 export { ResponsiveVideo } from "./components/ResponsiveVideo";
 export { SearchBox } from "./components/SearchBox";
 export {
-  Select, SelectContent, SelectGroup, SelectItem, SelectLabel, SelectSeparator, SelectTrigger, SelectValue
+  Select,
+  SelectContent,
+  SelectGroup,
+  SelectItem,
+  SelectLabel,
+  SelectSeparator,
+  SelectTrigger,
+  SelectValue,
 } from "./components/Select";
 export { Switch } from "./components/Switch";
 export { TabBar } from "./components/TabBar";
@@ -107,4 +125,3 @@ export { UserGroupIcon } from "./components/icons/UserGroupIcon";
 export { UserSearchGlasIcon } from "./components/icons/UserSearchGlasIcon";
 export { VeryDisappointedIcon } from "./components/icons/VeryDisappointedIcon";
 export { VideoTabletAdjustIcon } from "./components/icons/VideoTabletAdjustIcon";
-