diff --git a/src/test/retail/response-from-ps/search.response.json b/src/test/retail/response-from-ps/search.response.json
index 881ecaf677820612a49082775ab643887cba2083..5bdb97b5206f0b7bd82f90a4d2f00b2aa556dbc6 100644
--- a/src/test/retail/response-from-ps/search.response.json
+++ b/src/test/retail/response-from-ps/search.response.json
@@ -84,32 +84,7 @@
                   "recommended": true,
                   "location_id": "./retail.kirana/ind.blr/1@tourism-bpp-infra2.becknprotocol.io.provider_location",
                   "category_id": "c1",
-                  "fulfillment_id": "f1",
-                  "tags": [
-                    {
-                      "descriptor": { "name": "item-cataegory" },
-                      "list": [
-                        {
-                          "descriptor": { "name": "category" },
-                          "value": "retail"
-                        }
-                      ],
-                      "display": true
-                    },
-                    {
-                      "descriptor": { "name": "item-properties" },
-                      "list": [
-                        {
-                          "descriptor": { "name": "waterbottle" },
-                          "value": "y"
-                        },
-                        { "descriptor": { "name": "Trekking" }, "value": "y" },
-                        { "descriptor": { "name": "Sipper" }, "value": "y" },
-                        { "descriptor": { "name": "Hiking" }, "value": "y" }
-                      ],
-                      "display": true
-                    }
-                  ]
+                  "fulfillment_id": "f1"
                 }
               ]
             }
diff --git a/src/test/retail/response-to-ui/resopnse.cancel.json b/src/test/retail/response-to-ui/resopnse.cancel.json
index f2d33d599ba2bb64600f3f59e5c244764139f445..5d8b5f3c049356981bd4ee18547d889ef0cbcade 100644
--- a/src/test/retail/response-to-ui/resopnse.cancel.json
+++ b/src/test/retail/response-to-ui/resopnse.cancel.json
@@ -37,6 +37,11 @@
               "name": "Isothermal Stainless Steel Hiking Flask MH500 Yellow - Water bottle",
               "short_desc": "InstaCuppa Stainless Steel Thermos Flask Water Bottle with Sports Sipper Lid, Double Walled Vacuum Insulation",
               "long_desc": "<div> <ul> <li>ULTRA MODERN DESIGN - Our thermos bottle is crafted with a unique and modern design. Gone are the days of old and boring flasks. Guaranteed to impress your colleagues, friends & family.</li> <li>ADVANCED TEMPERATURE CONTROL – A double-wall, vacuum-insulated design helps lock in heat for up to 12 hours and cold for up to 24!</li> <li>ELIMINATES CONDENSATION – Offering improved grip and control, these innovative dual-layer bottles offer a slip-resistant surface that’s free of sweat and condensation..</li> <li>LEAK-PROOF and ECO-FRIENDLY – Remove, and clean, the large, screw on lid provides faster access to water inside and won’t spill a drop even when it’s tipped upside or put in your gym bag.</li> <li>The distress quilted jacket is a versatile fashion choice you can wear on any occasion. A style essential piece for Women which will reveal your strong sense of personality</li> </ul> <div> <p><b>Product Details</b></p> <ul> <li>Advanced Temperature Retention.This thermos water bottle ensures your beverages will remain hot or cold for a long time.Hot for up to 12 hours.Cold for up to 24 hours.</li> <li>Retains Original Flavors.Vacuum insulation ensures this travel thermos water bottle is airtight and retains the original flavor of your beverages.Also, this bottle is B.P.A Free.</li> <li>Premium Quality Materials.This stylish bottle is a double-walled vacuum insulated and made from premium 304-grade stainless steel - which makes this flask bottle.</li> </ul> </div>",
+              "images": [
+                {
+                  "url": "https://tourism-bpp-infra2.becknprotocol.io/attachments/view/253.jpg"
+                }
+              ],
               "price": {
                 "listed_value": "1200.0",
                 "currency": "INR",
diff --git a/src/test/retail/response-to-ui/response.confirm.json b/src/test/retail/response-to-ui/response.confirm.json
index 5dc469343721c84e5e6cbea83d210f4e14109ace..25319bcddc9abed67a658ffca14907cceead5756 100644
--- a/src/test/retail/response-to-ui/response.confirm.json
+++ b/src/test/retail/response-to-ui/response.confirm.json
@@ -30,17 +30,24 @@
           "id": "./retail.kirana/ind.blr/33@tourism-bpp-infra2.becknprotocol.io.provider",
           "name": "Venky.Mahadevan@Bazaar"
         },
-        "items": {
-          "id": "./retail.kirana/ind.blr/247@tourism-bpp-infra2.becknprotocol.io.item",
-          "name": "Isothermal Stainless Steel Hiking Flask MH500 Yellow - Water bottle",
-          "short_desc": "InstaCuppa Stainless Steel Thermos Flask Water Bottle with Sports Sipper Lid, Double Walled Vacuum Insulation",
-          "long_desc": "<div> <ul> <li>ULTRA MODERN DESIGN - Our thermos bottle is crafted with a unique and modern design. Gone are the days of old and boring flasks. Guaranteed to impress your colleagues, friends & family.</li> <li>ADVANCED TEMPERATURE CONTROL – A double-wall, vacuum-insulated design helps lock in heat for up to 12 hours and cold for up to 24!</li> <li>ELIMINATES CONDENSATION – Offering improved grip and control, these innovative dual-layer bottles offer a slip-resistant surface that’s free of sweat and condensation..</li> <li>LEAK-PROOF and ECO-FRIENDLY – Remove, and clean, the large, screw on lid provides faster access to water inside and won’t spill a drop even when it’s tipped upside or put in your gym bag.</li> <li>The distress quilted jacket is a versatile fashion choice you can wear on any occasion. A style essential piece for Women which will reveal your strong sense of personality</li> </ul> <div> <p><b>Product Details</b></p> <ul> <li>Advanced Temperature Retention.This thermos water bottle ensures your beverages will remain hot or cold for a long time.Hot for up to 12 hours.Cold for up to 24 hours.</li> <li>Retains Original Flavors.Vacuum insulation ensures this travel thermos water bottle is airtight and retains the original flavor of your beverages.Also, this bottle is B.P.A Free.</li> <li>Premium Quality Materials.This stylish bottle is a double-walled vacuum insulated and made from premium 304-grade stainless steel - which makes this flask bottle.</li> </ul> </div>",
-          "price": {
-            "listed_value": "1200.0",
-            "currency": "INR",
-            "value": "1200.0"
+        "items": [
+          {
+            "id": "./retail.kirana/ind.blr/247@tourism-bpp-infra2.becknprotocol.io.item",
+            "name": "Isothermal Stainless Steel Hiking Flask MH500 Yellow - Water bottle",
+            "short_desc": "InstaCuppa Stainless Steel Thermos Flask Water Bottle with Sports Sipper Lid, Double Walled Vacuum Insulation",
+            "long_desc": "<div> <ul> <li>ULTRA MODERN DESIGN - Our thermos bottle is crafted with a unique and modern design. Gone are the days of old and boring flasks. Guaranteed to impress your colleagues, friends & family.</li> <li>ADVANCED TEMPERATURE CONTROL – A double-wall, vacuum-insulated design helps lock in heat for up to 12 hours and cold for up to 24!</li> <li>ELIMINATES CONDENSATION – Offering improved grip and control, these innovative dual-layer bottles offer a slip-resistant surface that’s free of sweat and condensation..</li> <li>LEAK-PROOF and ECO-FRIENDLY – Remove, and clean, the large, screw on lid provides faster access to water inside and won’t spill a drop even when it’s tipped upside or put in your gym bag.</li> <li>The distress quilted jacket is a versatile fashion choice you can wear on any occasion. A style essential piece for Women which will reveal your strong sense of personality</li> </ul> <div> <p><b>Product Details</b></p> <ul> <li>Advanced Temperature Retention.This thermos water bottle ensures your beverages will remain hot or cold for a long time.Hot for up to 12 hours.Cold for up to 24 hours.</li> <li>Retains Original Flavors.Vacuum insulation ensures this travel thermos water bottle is airtight and retains the original flavor of your beverages.Also, this bottle is B.P.A Free.</li> <li>Premium Quality Materials.This stylish bottle is a double-walled vacuum insulated and made from premium 304-grade stainless steel - which makes this flask bottle.</li> </ul> </div>",
+            "images": [
+              {
+                "url": "https://tourism-bpp-infra2.becknprotocol.io/attachments/view/253.jpg"
+              }
+            ],
+            "price": {
+              "listed_value": "1200.0",
+              "currency": "INR",
+              "value": "1200.0"
+            }
           }
-        },
+        ],
         "fulfillments": [
           {
             "type": "Delivery",
diff --git a/src/test/retail/response-to-ui/response.init.json b/src/test/retail/response-to-ui/response.init.json
index 1d1735a17fe560f2529f6b5681c657fc63571767..a9da78b03269ee27000626fd199c4f3cdba7a3a2 100644
--- a/src/test/retail/response-to-ui/response.init.json
+++ b/src/test/retail/response-to-ui/response.init.json
@@ -37,6 +37,11 @@
               "name": "Isothermal Stainless Steel Hiking Flask MH500 Yellow - Water bottle",
               "short_desc": "InstaCuppa Stainless Steel Thermos Flask Water Bottle with Sports Sipper Lid, Double Walled Vacuum Insulation",
               "long_desc": "<div> <ul> <li>ULTRA MODERN DESIGN - Our thermos bottle is crafted with a unique and modern design. Gone are the days of old and boring flasks. Guaranteed to impress your colleagues, friends & family.</li> <li>ADVANCED TEMPERATURE CONTROL – A double-wall, vacuum-insulated design helps lock in heat for up to 12 hours and cold for up to 24!</li> <li>ELIMINATES CONDENSATION – Offering improved grip and control, these innovative dual-layer bottles offer a slip-resistant surface that’s free of sweat and condensation..</li> <li>LEAK-PROOF and ECO-FRIENDLY – Remove, and clean, the large, screw on lid provides faster access to water inside and won’t spill a drop even when it’s tipped upside or put in your gym bag.</li> <li>The distress quilted jacket is a versatile fashion choice you can wear on any occasion. A style essential piece for Women which will reveal your strong sense of personality</li> </ul> <div> <p><b>Product Details</b></p> <ul> <li>Advanced Temperature Retention.This thermos water bottle ensures your beverages will remain hot or cold for a long time.Hot for up to 12 hours.Cold for up to 24 hours.</li> <li>Retains Original Flavors.Vacuum insulation ensures this travel thermos water bottle is airtight and retains the original flavor of your beverages.Also, this bottle is B.P.A Free.</li> <li>Premium Quality Materials.This stylish bottle is a double-walled vacuum insulated and made from premium 304-grade stainless steel - which makes this flask bottle.</li> </ul> </div>",
+              "images": [
+                {
+                  "url": "https://tourism-bpp-infra2.becknprotocol.io/attachments/view/253.jpg"
+                }
+              ],
               "price": {
                 "listed_value": "1200.0",
                 "currency": "INR",
diff --git a/src/test/retail/response-to-ui/response.search.json b/src/test/retail/response-to-ui/response.search.json
index c3b1a1c5c4dc825a5c1124613601b65c3cc87719..473f17230246490879d5ede5e712e330426761be 100644
--- a/src/test/retail/response-to-ui/response.search.json
+++ b/src/test/retail/response-to-ui/response.search.json
@@ -50,40 +50,6 @@
                   {
                     "url": "https://tourism-bpp-infra2.becknprotocol.io/attachments/view/253.jpg"
                   }
-                ],
-                "tags": [
-                  {
-                    "name": "item-cataegory",
-                    "display": true,
-                    "list": [
-                      {
-                        "name": "category",
-                        "value": "retail"
-                      }
-                    ]
-                  },
-                  {
-                    "name": "item-properties",
-                    "display": true,
-                    "list": [
-                      {
-                        "name": "waterbottle",
-                        "value": "y"
-                      },
-                      {
-                        "name": "Trekking",
-                        "value": "y"
-                      },
-                      {
-                        "name": "Sipper",
-                        "value": "y"
-                      },
-                      {
-                        "name": "Hiking",
-                        "value": "y"
-                      }
-                    ]
-                  }
                 ]
               }
             ]
diff --git a/src/test/retail/response-to-ui/response.select.json b/src/test/retail/response-to-ui/response.select.json
index 313e8d93212a5aed82f5a3c87b4a16f7cba72cca..71176eed7c30d9598d5daff0b7b8592af5fbccce 100644
--- a/src/test/retail/response-to-ui/response.select.json
+++ b/src/test/retail/response-to-ui/response.select.json
@@ -59,13 +59,19 @@
               "name": "Isothermal Stainless Steel Hiking Flask MH500 Yellow - Water bottle",
               "short_desc": "InstaCuppa Stainless Steel Thermos Flask Water Bottle with Sports Sipper Lid, Double Walled Vacuum Insulation",
               "long_desc": "<div> <ul> <li>ULTRA MODERN DESIGN - Our thermos bottle is crafted with a unique and modern design. Gone are the days of old and boring flasks. Guaranteed to impress your colleagues, friends & family.</li> <li>ADVANCED TEMPERATURE CONTROL – A double-wall, vacuum-insulated design helps lock in heat for up to 12 hours and cold for up to 24!</li> <li>ELIMINATES CONDENSATION – Offering improved grip and control, these innovative dual-layer bottles offer a slip-resistant surface that’s free of sweat and condensation..</li> <li>LEAK-PROOF and ECO-FRIENDLY – Remove, and clean, the large, screw on lid provides faster access to water inside and won’t spill a drop even when it’s tipped upside or put in your gym bag.</li> <li>The distress quilted jacket is a versatile fashion choice you can wear on any occasion. A style essential piece for Women which will reveal your strong sense of personality</li> </ul> <div> <p><b>Product Details</b></p> <ul> <li>Advanced Temperature Retention.This thermos water bottle ensures your beverages will remain hot or cold for a long time.Hot for up to 12 hours.Cold for up to 24 hours.</li> <li>Retains Original Flavors.Vacuum insulation ensures this travel thermos water bottle is airtight and retains the original flavor of your beverages.Also, this bottle is B.P.A Free.</li> <li>Premium Quality Materials.This stylish bottle is a double-walled vacuum insulated and made from premium 304-grade stainless steel - which makes this flask bottle.</li> </ul> </div>",
+              "images": [
+                {
+                  "url": "https://tourism-bpp-infra2.becknprotocol.io/attachments/view/253.jpg"
+                }
+              ],
               "price": {
                 "listed_value": "1200.0",
                 "currency": "INR",
                 "value": "1200.0"
               }
             }
-          ]
+          ],
+          "fulfillments": [{ "id": "f1", "tracking": false }]
         }
       }
     }
diff --git a/src/test/retail/response-to-ui/response.status.json b/src/test/retail/response-to-ui/response.status.json
index d8c81823a4a325f9f69e5cef77a0144f87f0395e..991f6f3b0572030ed8ed8b1ffd859f8a64a5b9a1 100644
--- a/src/test/retail/response-to-ui/response.status.json
+++ b/src/test/retail/response-to-ui/response.status.json
@@ -33,6 +33,11 @@
               "name": "Isothermal Stainless Steel Hiking Flask MH500 Yellow - Water bottle",
               "short_desc": "InstaCuppa Stainless Steel Thermos Flask Water Bottle with Sports Sipper Lid, Double Walled Vacuum Insulation",
               "long_desc": "<div> <ul> <li>ULTRA MODERN DESIGN - Our thermos bottle is crafted with a unique and modern design. Gone are the days of old and boring flasks. Guaranteed to impress your colleagues, friends & family.</li> <li>ADVANCED TEMPERATURE CONTROL – A double-wall, vacuum-insulated design helps lock in heat for up to 12 hours and cold for up to 24!</li> <li>ELIMINATES CONDENSATION – Offering improved grip and control, these innovative dual-layer bottles offer a slip-resistant surface that’s free of sweat and condensation..</li> <li>LEAK-PROOF and ECO-FRIENDLY – Remove, and clean, the large, screw on lid provides faster access to water inside and won’t spill a drop even when it’s tipped upside or put in your gym bag.</li> <li>The distress quilted jacket is a versatile fashion choice you can wear on any occasion. A style essential piece for Women which will reveal your strong sense of personality</li> </ul> <div> <p><b>Product Details</b></p> <ul> <li>Advanced Temperature Retention.This thermos water bottle ensures your beverages will remain hot or cold for a long time.Hot for up to 12 hours.Cold for up to 24 hours.</li> <li>Retains Original Flavors.Vacuum insulation ensures this travel thermos water bottle is airtight and retains the original flavor of your beverages.Also, this bottle is B.P.A Free.</li> <li>Premium Quality Materials.This stylish bottle is a double-walled vacuum insulated and made from premium 304-grade stainless steel - which makes this flask bottle.</li> </ul> </div>",
+              "images": [
+                {
+                  "url": "https://tourism-bpp-infra2.becknprotocol.io/attachments/view/253.jpg"
+                }
+              ],
               "price": {
                 "listed_value": "1200.0",
                 "currency": "INR",