diff --git a/src/Components/Utils/Filter/useFilter.tsx b/src/Components/Utils/Filter/useFilter.tsx
index 71f8b32..7987ab1 100644
--- a/src/Components/Utils/Filter/useFilter.tsx
+++ b/src/Components/Utils/Filter/useFilter.tsx
@@ -45,7 +45,7 @@ const useFilter = () => {
     const handleState = () => {
       if (isOpen === ModalEnum?.FILTER) {
         setIsOpen("");
-        clearFilterState();
+        // clearFilterState();
         setFormValues({});
       } else {
         setIsOpen(ModalEnum?.FILTER);
@@ -93,7 +93,7 @@ const useFilter = () => {
       }
 
       // setIsOpen("");
-      clearFilterState();
+      // clearFilterState();
       setFormValues({});
     };
 
diff --git a/src/Pages/Admin/question/EditPage.tsx b/src/Pages/Admin/question/EditPage.tsx
index 7344c87..3879c84 100644
--- a/src/Pages/Admin/question/EditPage.tsx
+++ b/src/Pages/Admin/question/EditPage.tsx
@@ -52,7 +52,6 @@ const EditPage: React.FC = () => {
   });
 
   const objectToEdit = { ...data?.data, Questions: Questions?.data };
-  console.log(objectToEdit);
 
   useEffect(() => {
     if (objectToEdit?.isBase && isBseQuestion !== true) {
@@ -61,12 +60,14 @@ const EditPage: React.FC = () => {
   }, [objectToEdit?.isBase]);
 
   const [t] = useTranslation();
-
   const handleSubmit = (values: any) => {
     const DataToSend = structuredClone(values);
+    console.log(values)
     setTagsSearch(null);
+    
 
     if (isBseQuestion) {
+      setIsBseQuestion(false)
       const UpdateBseQuestion = {
         id: DataToSend?.id,
         content: DataToSend?.content,
@@ -146,6 +147,7 @@ const EditPage: React.FC = () => {
           });
         }
       });
+    
     } else {
       const keysToRemove = ["content_image"];
       console.log(DataToSend);
@@ -199,11 +201,9 @@ const EditPage: React.FC = () => {
     }
   }, [isSuccess]);
 
-  console.log(objectToEdit);
 
   const Loading =
     QuestionsDataLoading || dataLoading || isRefetchingParent || isRefetching;
-  console.log(Loading);
   const LoadingButton = isLoadingUpdate;
   if (Loading) {
     return <SpinContainer />;
diff --git a/src/Pages/Admin/question/Model/AddForm/BaseForm.tsx b/src/Pages/Admin/question/Model/AddForm/BaseForm.tsx
index 6328131..b67a954 100644
--- a/src/Pages/Admin/question/Model/AddForm/BaseForm.tsx
+++ b/src/Pages/Admin/question/Model/AddForm/BaseForm.tsx
@@ -6,6 +6,7 @@ import Header from "../../../../../Components/exercise/Header";
 import { useNavigate } from "react-router-dom";
 import { Spin } from "antd";
 import BaseForm from "../../Model/Malty/Form";
+import { useMemo } from "react";
 
 const BaseFormContainer = ({
   handleFormSubmit,
@@ -26,18 +27,22 @@ const BaseFormContainer = ({
   const handleCancel = () => {
     navigate(-1);
   };
+  const initialValues = useMemo(
+  () => getInitialValuesBase({} as any),
+  []
+);
 
   return (
     <div className="QuestionPractical">
       <header>
-        <MdOutlineArrowForwardIos onClick={handleNavigateToPage} />{" "}
+        <MdOutlineArrowForwardIos onClick={handleNavigateToPage} className="link" />{" "}
         {t("header.add_new_question")}
       </header>
 
       <div className="exercise_add">
         <Formik
           onSubmit={handleFormSubmit}
-          initialValues={getInitialValuesBase({} as any)}
+          initialValues={initialValues}
           validationSchema={getValidationSchemaBase}
           enableReinitialize
         >
diff --git a/src/Pages/Admin/question/Model/ModelForm.tsx b/src/Pages/Admin/question/Model/ModelForm.tsx
index 1df6c91..8c2faf7 100644
--- a/src/Pages/Admin/question/Model/ModelForm.tsx
+++ b/src/Pages/Admin/question/Model/ModelForm.tsx
@@ -82,9 +82,9 @@ const Form = () => {
             name="hint"
             label={t("input.hint_question")}
             type="TextArea"
-            style={{ width: "100%", height: 60, resize: "none" }}
+            // style={{ width: "100%", height: 60, resize: "none" }}
             showCount={false}
-            autoSize={{ minRows: 2, maxRows: 10 }}
+            // autoSize={{ minRows: 2, maxRows: 10 }}
           />
         )}
         <SelectTag />
diff --git a/src/Pages/Admin/question/formUtil.ts b/src/Pages/Admin/question/formUtil.ts
index 4aaa6b9..93e048a 100644
--- a/src/Pages/Admin/question/formUtil.ts
+++ b/src/Pages/Admin/question/formUtil.ts
@@ -79,8 +79,10 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
       name: tag?.name,
     }));
     const newAnswers = item?.answers?.map((item: any) => {
+
       return {
         ...item,
+        id:item?.id ,
         content: item?.content ?? null,
       };
     });
@@ -88,7 +90,8 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
 
     return {
       ...item,
-      answer: newAnswers,
+      id: item?.id,
+      answers: newAnswers,
       hint: item?.hint ?? "",
       canAnswersBeShuffled: 0,
       isBase: 0,
@@ -96,8 +99,9 @@ export const getInitialValuesBase = (objectToEdit: Question): any => {
       meta: item?.meta,
     };
   });
+  const uid =  Date.now().toString() + Math.random().toString(36).substring(2, 9)
 
-  const questions = newQuestions ?? [{ answers: [] }];
+  const questions = newQuestions ?? [{ id: uid ,answers: [] }];
   console.log(questions?.[0]?.meta, "questions");
 
   return {
diff --git a/src/types/Item.ts b/src/types/Item.ts
index c4565ce..fad3439 100644
--- a/src/types/Item.ts
+++ b/src/types/Item.ts
@@ -283,6 +283,7 @@ export type Exercise = {};
 
 export type Choice = {
   name: string;
+  id:number
 };
 
 export type tags = {