diff --git a/kraken-app/kraken-app-portal/src/components/ExampleValueModal/index.tsx b/kraken-app/kraken-app-portal/src/components/ExampleValueModal/index.tsx
index 177929cbb..2a9b176e2 100644
--- a/kraken-app/kraken-app-portal/src/components/ExampleValueModal/index.tsx
+++ b/kraken-app/kraken-app-portal/src/components/ExampleValueModal/index.tsx
@@ -42,8 +42,6 @@ const ExampleValueModal = ({
     const initial = defaultValue || '';
     setValue(initial);
   }, [sellerAPIExampleProps, defaultValue, attribute, location]);
-
-  console.log('ExampleValueModal value:', value);
   return (
     <Modal
       open={isOpen}
diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSellerProp/index.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSellerProp/index.tsx
index 03308a4b0..889ce53c0 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSellerProp/index.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSellerProp/index.tsx
@@ -19,6 +19,7 @@ const RightAddSellerProp = ({ onSelect }: Readonly<Props>) => {
   const [selectedProp, setSelectedProp] = useState<any>({
     location: rightSideInfo?.previousData?.targetLocation,
     name: rightSideInfo?.previousData?.target,
+    schemaType: rightSideInfo?.previousData?.schemaType, 
   });
   const pathParameters = useMemo(() => {
     if (!sellerApi?.spec?.parameters) return [];
diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSonataProp/index.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSonataProp/index.tsx
index 13b816b5d..269f48f43 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSonataProp/index.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/RightAddSonataProp/index.tsx
@@ -98,7 +98,6 @@ const RightAddSonataProp = ({
     setSelectedProp,
     onSelect,
   });
-
   return (
     <Flex
       vertical
diff --git a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/commonHook.tsx b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/commonHook.tsx
index 210c6f8ec..d8119d9c2 100644
--- a/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/commonHook.tsx
+++ b/kraken-app/kraken-app-portal/src/pages/NewAPIMapping/components/commonHook.tsx
@@ -48,9 +48,19 @@ export const useCommonAddProp = ({
     }
     // selectedProp = { name: string, location: string }
     // propery name should follow this format: @{{ prop_name }}
+    let propertyName = '';
+    if (selectedProp?.location === 'HYBRID') {
+      propertyName = `${selectedProp.name}`;
+    } else if (selectedProp?.location === 'QUERY') {
+      propertyName = selectedProp.schemaType === 'object'
+      ? `${selectedProp.name}={}`
+      : `@{{${selectedProp.name}}}`;
+    } else {
+      propertyName = `@{{${selectedProp.name}}}`;
+    }
     onSelect?.({
       ...selectedProp,
-      name: selectedProp?.location === 'HYBRID'?`${selectedProp.name}`:`@{{${selectedProp.name}}}`,
+      name: propertyName,
       title: rightSideInfo?.title,
     });
   }, [selectedProp, onSelect, rightSideInfo]);
@@ -107,7 +117,6 @@ export const useCommonAddProp = ({
   const handleAddParamHybrid = (value: string) => {
     setHybridField("param", value);
   };
-
   const collapseItems = useMemo(() => {
     const items: CollapseProps["items"] = [];
     if (pathParameters.length) {
@@ -202,16 +211,6 @@ export const useCommonAddProp = ({
         ),
         children: (
           <Flex vertical gap={8} className={styles.paramList}>
-            {isOpen && currentProp?.path === "QUERY" && (
-              <ExampleValueModal
-                location={currentProp?.path || ""}
-                attribute={currentProp?.name || ""}
-                isOpen={isOpen}
-                onClose={close}
-                onOK={handleAddParamHybrid}
-                defaultValue={rightSideInfo?.previousData?.target}
-              />
-            )}
             {queryParameters.map((parameter: any) => {
             const sellerValue = sellerAPIExampleProps?.param?.[parameter.name];
             const sonataValue = rightSideInfo?.previousData?.target;
@@ -233,12 +232,14 @@ export const useCommonAddProp = ({
                       setSelectedProp({
                         location: "HYBRID",
                         name: sellerValue,
+                        schemaType: parameter.schema?.type,
                       });
                       return;
                     }
                     setSelectedProp({
                       location: "QUERY",
                       name: parameter.name,
+                      schemaType: parameter.schema?.type,
                     });
                   }}
                 >
@@ -249,9 +250,6 @@ export const useCommonAddProp = ({
                         type="link"
                         onClick={() => handleProp(parameter.name, "QUERY")}
                       >
-                        {(sonataValue)
-                          ? "Edit value with variable"
-                          : "Add value with variable"}
                       </Button>
                     ) : null}
                     <TypeTag type={parameter.schema.type} />