diff --git a/ui/src/components/AdvancePropertise/index.tsx b/ui/src/components/AdvancePropertise/index.tsx
index 56b4b4d95..26f28cdd4 100644
--- a/ui/src/components/AdvancePropertise/index.tsx
+++ b/ui/src/components/AdvancePropertise/index.tsx
@@ -11,7 +11,7 @@ import {
   Icon,
   Select,
   Radio,
-  Button,
+  Button
 } from '@contentstack/venus-components';
 
 // Service
@@ -78,13 +78,28 @@ const AdvancePropertise = (props: SchemaProps) => {
   const [embedObjectsLabels, setEmbedObjectsLabels] = useState<string[]>(
     props?.value?.embedObjects
   );
-  const [referencedCT, setReferencedCT] = useState<ContentTypeOption[] | null>(referencedItems || null);
+  const [referencedCT, setReferencedCT] = useState<ContentTypeOption[] | null>(
+    referencedItems || null
+  );
   const [showOptions, setShowOptions] = useState<Record<number, boolean>>({});
   const [showIcon, setShowIcon] = useState<number>();
   const filterRef = useRef<HTMLDivElement | null>(null);
   const [options, setOptions] = useState(props?.value?.options || []);
   const [draggedIndex, setDraggedIndex] = useState<number | null>(null);
 
+  useEffect(() => {
+    if (props?.data?.refrenceTo && Array.isArray(props?.data?.refrenceTo)) {
+      const updatedReferencedItems = props?.data?.refrenceTo.map((item: string) => ({
+        label: item,
+        value: item
+      }));
+      setReferencedCT(updatedReferencedItems);
+      setToggleStates((prevStates) => ({
+        ...prevStates,
+        referenedItems: props?.data?.refrenceTo
+      }));
+    }
+  }, [props?.data?.refrenceTo]);
   useEffect(() => {
     const defaultIndex = toggleStates?.option?.findIndex(
       (item: optionsType) => toggleStates?.default_value === item?.key
@@ -344,9 +359,9 @@ const AdvancePropertise = (props: SchemaProps) => {
 
   const option = validateArray(contentTypesList)
     ? contentTypesList?.map((option: ContentType) => ({
-      label: option?.contentstackTitle,
-      value: option?.contentstackUid
-    }))
+        label: option?.contentstackTitle,
+        value: option?.contentstackUid
+      }))
     : [{ label: contentTypesList, value: contentTypesList }];
 
   return (
@@ -372,8 +387,7 @@ const AdvancePropertise = (props: SchemaProps) => {
                     draggable
                     onDragStart={() => handleDragStart(index)}
                     onDragOver={(e) => handleDragOver(e, index)}
-                    onDrop={() => handleDrop(index)}
-                  >
+                    onDrop={() => handleDrop(index)}>
                     <div className="term-drag-icon">
                       <Icon icon="ActionBar" size="medium" version="v2" />
                     </div>
@@ -387,8 +401,7 @@ const AdvancePropertise = (props: SchemaProps) => {
                         index === showIcon && (
                           <Icon icon={'CheckSquareOffset'} version="v2" size="medium" />
                         )
-                      }
-                    ></TextInput>
+                      }></TextInput>
 
                     <Button
                       buttonType="light"
@@ -397,8 +410,7 @@ const AdvancePropertise = (props: SchemaProps) => {
                       canCloseOnClickOutside={true}
                       size={'small'}
                       icon={'v2-DotsThreeLargeVertical'}
-                      onClick={() => handleOnClick(index)}
-                    ></Button>
+                      onClick={() => handleOnClick(index)}></Button>
 
                     {showOptions[index] && (
                       <div className="dropdown-filter-wrapper" ref={filterRef}>
@@ -408,8 +420,7 @@ const AdvancePropertise = (props: SchemaProps) => {
                             buttonType="light"
                             icon={'v2-CheckSquareOffset'}
                             size={'small'}
-                            onClick={() => handleDefalutValue(index, option)}
-                          >
+                            onClick={() => handleDefalutValue(index, option)}>
                             Mark as Default
                           </Button>
                         ) : (
@@ -418,8 +429,7 @@ const AdvancePropertise = (props: SchemaProps) => {
                             buttonType="light"
                             icon={'v2-CheckSquareOffset'}
                             size={'small'}
-                            onClick={() => handleRemoveDefalutValue(index)}
-                          >
+                            onClick={() => handleRemoveDefalutValue(index)}>
                             Remove as Default
                           </Button>
                         )}
@@ -433,53 +443,52 @@ const AdvancePropertise = (props: SchemaProps) => {
 
           {(props?.fieldtype === 'Single Line Textbox' ||
             props?.fieldtype === 'Multi Line Textbox') && (
-              <>
-                <Field>
-                  <FieldLabel htmlFor="validation" version="v2">
-                    Default Value
-                  </FieldLabel>
-                  <Tooltip
-                    content={
-                      'Set a default field value for this field. The value will appear by default while creating an entry for this content type.'
-                    }
-                    position="right"
-                  >
-                    <Icon icon="Question" size="small" version="v2" className="Help" />
-                  </Tooltip>
-                  <TextInput
-                    type="text"
-                    value={toggleStates?.default_value}
-                    placeholder="Enter value"
-                    version="v2"
-                    onChange={
-                      handleOnChange &&
-                      ((e: React.ChangeEvent<HTMLInputElement>) =>
-                        handleOnChange('default_value', e, true))
-                    }
-                  />
-                </Field>
-
-                <Field>
-                  <FieldLabel htmlFor="validation" version="v2">
-                    Validation (Regex)
-                  </FieldLabel>
-                  <Tooltip content={'Define the validation for the field.'} position="right">
-                    <Icon icon="Question" size="small" version="v2" className="Help" />
-                  </Tooltip>
-                  <TextInput
-                    type="text"
-                    value={toggleStates?.validationRegex}
-                    placeholder="Enter value"
-                    version="v2"
-                    onChange={
-                      handleOnChange &&
-                      ((e: React.ChangeEvent<HTMLInputElement>) =>
-                        handleOnChange('validationRegex', e, true))
-                    }
-                  />
-                </Field>
-              </>
-            )}
+            <>
+              <Field>
+                <FieldLabel htmlFor="validation" version="v2">
+                  Default Value
+                </FieldLabel>
+                <Tooltip
+                  content={
+                    'Set a default field value for this field. The value will appear by default while creating an entry for this content type.'
+                  }
+                  position="right">
+                  <Icon icon="Question" size="small" version="v2" className="Help" />
+                </Tooltip>
+                <TextInput
+                  type="text"
+                  value={toggleStates?.default_value}
+                  placeholder="Enter value"
+                  version="v2"
+                  onChange={
+                    handleOnChange &&
+                    ((e: React.ChangeEvent<HTMLInputElement>) =>
+                      handleOnChange('default_value', e, true))
+                  }
+                />
+              </Field>
+
+              <Field>
+                <FieldLabel htmlFor="validation" version="v2">
+                  Validation (Regex)
+                </FieldLabel>
+                <Tooltip content={'Define the validation for the field.'} position="right">
+                  <Icon icon="Question" size="small" version="v2" className="Help" />
+                </Tooltip>
+                <TextInput
+                  type="text"
+                  value={toggleStates?.validationRegex}
+                  placeholder="Enter value"
+                  version="v2"
+                  onChange={
+                    handleOnChange &&
+                    ((e: React.ChangeEvent<HTMLInputElement>) =>
+                      handleOnChange('validationRegex', e, true))
+                  }
+                />
+              </Field>
+            </>
+          )}
 
           {props?.fieldtype === 'Link' && (
             <>
@@ -491,8 +500,7 @@ const AdvancePropertise = (props: SchemaProps) => {
                   content={
                     'Set a default field value for this field. The value will appear by default while creating an entry for this content type.'
                   }
-                  position="right"
-                >
+                  position="right">
                   <Icon icon="Question" size="small" version="v2" className="Help" />
                 </Tooltip>
               </div>
@@ -540,13 +548,11 @@ const AdvancePropertise = (props: SchemaProps) => {
                 <Radio
                   label={'True'}
                   checked={toggleStates?.default_value === true}
-                  onChange={() => handleRadioChange('default_value', true)}
-                ></Radio>
+                  onChange={() => handleRadioChange('default_value', true)}></Radio>
                 <Radio
                   label={'False'}
                   checked={toggleStates?.default_value === false}
-                  onChange={() => handleRadioChange('default_value', false)}
-                ></Radio>
+                  onChange={() => handleRadioChange('default_value', false)}></Radio>
               </div>
             </Field>
           )}
@@ -564,19 +570,25 @@ const AdvancePropertise = (props: SchemaProps) => {
                   setReferencedCT(selectedOptions);
                   const referencedArray = selectedOptions?.map((item: optionsType) => item?.value);
 
+                  setToggleStates((prevStates) => ({
+                    ...prevStates,
+                    referenedItems: referencedArray
+                  }));
+
                   props?.updateFieldSettings(
                     props?.rowId,
                     {
                       ...props?.value,
+                      mandatory: toggleStates?.mandatory, 
+                      nonLocalizable: toggleStates?.nonLocalizable, 
                       validationRegex: toggleStates?.validationRegex ?? '',
-                      referenedItems: referencedArray // <-- update only this property!
+                      referenedItems: referencedArray
                     },
                     true,
                     props?.data?.contentstackFieldUid
                   );
                 }}
-                options={
-                  option}
+                options={option}
                 placeholder="Add Content Type(s)"
                 version="v2"
                 isSearchable={true}
@@ -595,54 +607,56 @@ const AdvancePropertise = (props: SchemaProps) => {
             <div className="options-class">
               {(props?.fieldtype === 'HTML Rich text Editor' ||
                 props?.fieldtype === 'JSON Rich Text Editor') && (
-                  <>
-                    <div className="ToggleWrap">
-                      <ToggleSwitch
-                        label="Embed Object(s)"
-                        labelColor="primary"
-                        labelPosition="right"
-                        checked={(ctValue?.length ?? 0) > 0 || toggleStates?.embedObject}
-                        onChange={
-                          handleToggleChange &&
-                          ((e: React.MouseEvent<HTMLElement>) =>
-                            handleToggleChange(
-                              'embedObject',
-                              (e.target as HTMLInputElement)?.checked,
-                              true
-                            ))
-                        }
-                      />
-                    </div>
+                <>
+                  <div className="ToggleWrap">
+                    <ToggleSwitch
+                      label="Embed Object(s)"
+                      labelColor="primary"
+                      labelPosition="right"
+                      checked={(ctValue?.length ?? 0) > 0 || toggleStates?.embedObject}
+                      onChange={
+                        handleToggleChange &&
+                        ((e: React.MouseEvent<HTMLElement>) =>
+                          handleToggleChange(
+                            'embedObject',
+                            (e.target as HTMLInputElement)?.checked,
+                            true
+                          ))
+                      }
+                    />
+                  </div>
 
-                    {((ctValue && ctValue?.length > 0) || toggleStates?.embedObject) && (
-                      <Select
-                        value={ctValue}
-                        isMulti={true}
-                        onChange={(selectedOptions: ContentTypeOption[]) => {
-                          setCTValue(selectedOptions);
-                          const embedObject = selectedOptions?.map((item: optionsType) => item?.value); // Update the state with the selected options
-                          props?.updateFieldSettings(
-                            props?.rowId,
-                            {
-                              validationRegex: toggleStates?.validationRegex ?? '',
-                              embedObjects: embedObject
-                            },
-                            true,
-                            props?.data?.contentstackFieldUid
-                          );
-                        }}
-                        options={option}
-                        placeholder="Select Content Types"
-                        version="v2"
-                        isSearchable={true}
-                        isClearable={true}
-                        width="350px"
-                        maxMenuHeight={200}
+                  {((ctValue && ctValue?.length > 0) || toggleStates?.embedObject) && (
+                    <Select
+                      value={ctValue}
+                      isMulti={true}
+                      onChange={(selectedOptions: ContentTypeOption[]) => {
+                        setCTValue(selectedOptions);
+                        const embedObject = selectedOptions?.map(
+                          (item: optionsType) => item?.value
+                        ); // Update the state with the selected options
+                        props?.updateFieldSettings(
+                          props?.rowId,
+                          {
+                            validationRegex: toggleStates?.validationRegex ?? '',
+                            embedObjects: embedObject
+                          },
+                          true,
+                          props?.data?.contentstackFieldUid
+                        );
+                      }}
+                      options={option}
+                      placeholder="Select Content Types"
+                      version="v2"
+                      isSearchable={true}
+                      isClearable={true}
+                      width="350px"
+                      maxMenuHeight={200}
                       // isSelectAll={true}
-                      />
-                    )}
-                  </>
-                )}
+                    />
+                  )}
+                </>
+              )}
               {props?.fieldtype !== 'Global' && props?.fieldtype !== 'Boolean' && (
                 <div className="ToggleWrap">
                   <ToggleSwitch
@@ -667,8 +681,7 @@ const AdvancePropertise = (props: SchemaProps) => {
                 <Tooltip
                   content="Available only if there are multiple languages in your stack"
                   position="top"
-                  disabled={props?.isLocalised}
-                >
+                  disabled={props?.isLocalised}>
                   <ToggleSwitch
                     id="disabled"
                     disabled={!props?.isLocalised}
diff --git a/ui/src/components/ContentMapper/index.tsx b/ui/src/components/ContentMapper/index.tsx
index f18bee009..30fa2f407 100644
--- a/ui/src/components/ContentMapper/index.tsx
+++ b/ui/src/components/ContentMapper/index.tsx
@@ -860,7 +860,7 @@ const ContentMapper = forwardRef(({ handleStepChange }: contentMapperProps, ref:
       if (row?.uid === rowId && row?.contentstackFieldUid === rowContentstackFieldUid) {
         const updatedRow = {
           ...row,
-          refrenceTo: updatedSettings?.referenedItems,
+          refrenceTo: updatedSettings?.referenedItems || row?.refrenceTo,
           advanced: { ...row?.advanced, ...updatedSettings }
         };
         return updatedRow;
diff --git a/upload-api/migration-aem/libs/contentType/components/SearchComponent.ts b/upload-api/migration-aem/libs/contentType/components/SearchComponent.ts
index 4dc15edb1..58c3a6735 100644
--- a/upload-api/migration-aem/libs/contentType/components/SearchComponent.ts
+++ b/upload-api/migration-aem/libs/contentType/components/SearchComponent.ts
@@ -45,6 +45,7 @@ export class SearchComponent extends ContentstackComponent {
       uid: key,
       displayName: key,
       description: "",
+      isNumber: true,
       defaultValue: ""
     }).toContentstack(),
     object: () => null,
diff --git a/upload-api/migration-aem/libs/contentType/components/TeaserComponent.ts b/upload-api/migration-aem/libs/contentType/components/TeaserComponent.ts
index 2020b9278..757b5684d 100644
--- a/upload-api/migration-aem/libs/contentType/components/TeaserComponent.ts
+++ b/upload-api/migration-aem/libs/contentType/components/TeaserComponent.ts
@@ -65,6 +65,7 @@ export class TeaserComponent extends ContentstackComponent {
       uid: key,
       displayName: key,
       description: "",
+      isNumber: true,
       defaultValue: ""
     }).toContentstack(),
     object: (key, schemaProp) => {