diff --git a/resources/views/cart/coupon.blade.php b/resources/views/cart/coupon.blade.php
index 79dd10f8..33c247fc 100644
--- a/resources/views/cart/coupon.blade.php
+++ b/resources/views/cart/coupon.blade.php
@@ -4,7 +4,7 @@
             <x-rapidez-ct::coupon-field />
             <template v-if="cart.applied_coupons?.length" v-for="coupon in cart.applied_coupons" v-cloak>
                 <graphql-mutation
-                    :query="'mutation ($cart_id: String!) { removeCouponFromCart(input: { cart_id: $cart_id }) { cart { ' + config.queries.cart + ' } } }'"
+                    :query="'mutation ($cart_id: String!) { removeCouponFromCart(input: { cart_id: $cart_id })  { ...cart } } ' + config.fragments.cart"
                     :variables="{ cart_id: mask }"
                     :callback="updateCart"
                     :error-callback="checkResponseForExpiredCart"
diff --git a/resources/views/cart/partials/product/remove-button.blade.php b/resources/views/cart/partials/product/remove-button.blade.php
index f528ecef..45d4d1bb 100644
--- a/resources/views/cart/partials/product/remove-button.blade.php
+++ b/resources/views/cart/partials/product/remove-button.blade.php
@@ -1,5 +1,5 @@
 <graphql-mutation
-    :query="'mutation ($cart_id: String!, $cart_item_id: Int) { removeItemFromCart(input: { cart_id: $cart_id, cart_item_id: $cart_item_id }) { cart { ' + config.queries.cart + ' } } }'"
+    :query="'mutation ($cart_id: String!, $cart_item_id: Int) { removeItemFromCart(input: { cart_id: $cart_id, cart_item_id: $cart_item_id })  { ...cart } } ' + config.fragments.cart"
     :variables="{ cart_id: mask, cart_item_id: item.id }"
     :notify="{ message: item.product.name+' '+config.translations.cart.remove }"
     :callback="updateCart"
@@ -9,4 +9,4 @@
     <button v-on:click="mutate" class="text-ct-inactive mt-1 text-xs hover:underline" :dusk="'item-delete-' + index">
         @lang('Remove')
     </button>
-</graphql-mutation>
\ No newline at end of file
+</graphql-mutation>
diff --git a/resources/views/checkout/partials/address-cards.blade.php b/resources/views/checkout/partials/address-cards.blade.php
index 3525c981..cc542675 100644
--- a/resources/views/checkout/partials/address-cards.blade.php
+++ b/resources/views/checkout/partials/address-cards.blade.php
@@ -1,6 +1,6 @@
 <div class="grid gap-5 md:grid-cols-2">
     <template v-if="cart.billing_address?.same_as_shipping">
-        <x-rapidez-ct::card.address v-bind:address="cart.shipping_addresses[0]" shipping billing check>
+        <x-rapidez-ct::card.address v-bind:address="cart.shipping_addresses[0]" shipping billing check="cart.shipping_addresses[0]">
             <x-rapidez-ct::button.link v-on:click.prevent="toggleEdit">
                 @lang('Edit')
             </x-rapidez-ct::button.link>
@@ -8,7 +8,7 @@
         @include('rapidez-ct::checkout.partials.buttons.new-address')
     </template>
     <template v-else>
-        <x-rapidez-ct::card.address v-bind:address="cart.shipping_addresses[0]" shipping check class="h-full">
+        <x-rapidez-ct::card.address v-bind:address="cart.shipping_addresses[0]" shipping check="cart.shipping_addresses[0]" class="h-full">
             <x-rapidez-ct::button.link v-on:click.prevent="toggleEdit">
                 @lang('Edit')
             </x-rapidez-ct::button.link>
@@ -20,7 +20,7 @@
                 <input type="checkbox" oninvalid="this.setCustomValidity('{{ __('Please select an address') }}')" required class="absolute w-full h-full inset-0 opacity-0 pointer-events-none">
             </x-slot>
         </x-rapidez-ct::card.address>
-        <x-rapidez-ct::card.address v-bind:address="cart.billing_address" billing check class="h-full">
+        <x-rapidez-ct::card.address v-bind:address="cart.billing_address" billing check="cart.billing_address" class="h-full">
             <x-rapidez-ct::button.link v-on:click.prevent="toggleEdit">
                 @lang('Edit')
             </x-rapidez-ct::button.link>
diff --git a/resources/views/checkout/partials/sections/address.blade.php b/resources/views/checkout/partials/sections/address.blade.php
index f3608fe8..0df82c9f 100644
--- a/resources/views/checkout/partials/sections/address.blade.php
+++ b/resources/views/checkout/partials/sections/address.blade.php
@@ -16,7 +16,6 @@
                     country_code: cart.shipping_addresses[0]?.country.code || window.address_defaults.country_code
                 }"
                 group="shipping"
-                :before-request="(query, variables, options) => [variables.customer_address_id ? config.queries.setExistingShippingAddressesOnCart : query, variables, options]"
                 :callback="updateCart"
                 :error-callback="checkResponseForExpiredCart"
                 :watch="false"
@@ -37,7 +36,6 @@
                     same_as_shipping: !cart.is_virtual && (cart?.billing_address?.same_as_shipping ?? true),
                     country_code: cart.billing_address?.country.code || window.address_defaults.country_code
                 }))"
-                :before-request="(query, variables, options) => [variables.customer_address_id ? config.queries.setExistingBillingAddressOnCart : query, variables, options]"
                 :callback="updateCart"
                 :error-callback="checkResponseForExpiredCart"
                 :watch="false"
diff --git a/resources/views/components/coupon-field.blade.php b/resources/views/components/coupon-field.blade.php
index 91b2a2ac..e254b22a 100644
--- a/resources/views/components/coupon-field.blade.php
+++ b/resources/views/components/coupon-field.blade.php
@@ -1,5 +1,5 @@
 <graphql-mutation
-    :query="'mutation ($cart_id: String!, $coupon_code: String!) { applyCouponToCart(input: { cart_id: $cart_id, coupon_code: $coupon_code }) { cart { ' + config.queries.cart + ' } } }'"
+    :query="'mutation ($cart_id: String!, $coupon_code: String!) { applyCouponToCart(input: { cart_id: $cart_id, coupon_code: $coupon_code })  { ...cart } } ' + config.fragments.cart"
     :variables="{ cart_id: mask, coupon_code: '' }"
     :notify="{ message: config.translations.cart.coupon.applied }"
     :clear="true"
diff --git a/resources/views/components/input/quantity.blade.php b/resources/views/components/input/quantity.blade.php
index f05f1e1d..687e6d98 100644
--- a/resources/views/components/input/quantity.blade.php
+++ b/resources/views/components/input/quantity.blade.php
@@ -1,6 +1,6 @@
 
 <graphql-mutation
-    :query="'mutation ($cart_id: String!, $cart_item_id: Int, $quantity: Float) { updateCartItems(input: { cart_id: $cart_id, cart_items: [{ cart_item_id: $cart_item_id, quantity: $quantity }] }) { cart { ' + config.queries.cart + ' } } }'"
+    :query="'mutation ($cart_id: String!, $cart_item_id: Int, $quantity: Float) { updateCartItems(input: { cart_id: $cart_id, cart_items: [{ cart_item_id: $cart_item_id, quantity: $quantity }] }) { cart { ...cart } } } ' + config.fragments.cart"
     :variables="{ cart_id: mask, cart_item_id: item.id, quantity: item.quantity }"
     :callback="updateCart"
     :error-callback="checkResponseForExpiredCart"