diff --git a/src/frontend/src/components/layout/bulkedit/BulkEditRow.vue b/src/frontend/src/components/layout/bulkedit/BulkEditRow.vue
index 3b5d815..1142da8 100644
--- a/src/frontend/src/components/layout/bulkedit/BulkEditRow.vue
+++ b/src/frontend/src/components/layout/bulkedit/BulkEditRow.vue
@@ -25,16 +25,19 @@
         </div>
         <div class="bulk-edit-row__status">
           <transition name="badge-transition" mode="out-in">
-            <circle-badge v-if="materialCheck && showMaterialCheck" :key="'check-' + id" variant="primary" icon="check" class="badge--check"></circle-badge>
-            <circle-badge v-else-if="!materialCheck" :key="'error-' + id" variant="exception" icon="exclamation-mark"></circle-badge>
+            <circle-badge v-if="materialCheck && showMaterialCheck" :key="'check-' + id" variant="primary" icon="check"
+                          class="badge--check"></circle-badge>
+            <circle-badge v-else-if="!materialCheck" :key="'error-' + id" variant="exception"
+                          icon="exclamation-mark"></circle-badge>
           </transition>
         </div>
       </div>
     </div>
 
     <div class="bulk-edit-row__cell-container">
-      <div class="bulk-edit-row__cell bulk-edit-row__cell--status bulk-edit-row__cell--clickable edit-calculation-list-header-cell--copyable"
-           @click="action($event,'price')">
+      <div
+          class="bulk-edit-row__cell bulk-edit-row__cell--status bulk-edit-row__cell--clickable edit-calculation-list-header-cell--copyable"
+          @click="action($event,'price')">
         <div class="bulk-edit-row__data">
           <div class="bulk-edit-row__line bulk-edit-row__line--sub">
             <ph-tag size="16"/>
@@ -52,15 +55,17 @@
           <transition name="badge-transition" mode="out-in">
             <circle-badge v-if="priceCheck && showPriceCheck" :key="'check-price-' + id" variant="primary"
                           icon="check" class="badge--check"></circle-badge>
-            <circle-badge v-else-if="!priceCheck" :key="'error-price-' + id" variant="exception" icon="exclamation-mark"></circle-badge>
+            <circle-badge v-else-if="!priceCheck" :key="'error-price-' + id" variant="exception"
+                          icon="exclamation-mark"></circle-badge>
           </transition>
         </div>
       </div>
     </div>
 
     <div class="bulk-edit-row__cell-container">
-      <div class="bulk-edit-row__cell bulk-edit-row__cell--status bulk-edit-row__cell--clickable edit-calculation-list-header-cell--copyable"
-           @click="action($event,'packaging')">
+      <div
+          class="bulk-edit-row__cell bulk-edit-row__cell--status bulk-edit-row__cell--clickable edit-calculation-list-header-cell--copyable"
+          @click="action($event,'packaging')">
         <div class="bulk-edit-row__data">
           <div class="bulk-edit-row__line bulk-edit-row__line--sub">
             <PhVectorThree size="16"/>
@@ -147,7 +152,8 @@
           <transition name="badge-transition" mode="out-in">
             <circle-badge v-if="destinationCheck && showDestinationCheck" :key="'check-dest-' + id" variant="primary"
                           icon="check" class="badge--check"></circle-badge>
-            <circle-badge v-else-if="!destinationCheck" :key="'error-dest-' + id" variant="exception" icon="exclamation-mark"></circle-badge>
+            <circle-badge v-else-if="!destinationCheck" :key="'error-dest-' + id" variant="exception"
+                          icon="exclamation-mark"></circle-badge>
           </transition>
         </div>
       </div>
@@ -195,7 +201,8 @@
           <transition name="badge-transition" mode="out-in">
             <circle-badge v-if="routeCheck && showRouteCheck" :key="'check-route-' + id" variant="primary"
                           icon="check" class="badge--check"></circle-badge>
-            <circle-badge v-else-if="!routeCheck" :key="'error-route-' + id" variant="exception" icon="exclamation-mark"></circle-badge>
+            <circle-badge v-else-if="!routeCheck" :key="'error-route-' + id" variant="exception"
+                          icon="exclamation-mark"></circle-badge>
           </transition>
         </div>
       </div>
@@ -275,7 +282,7 @@ export default {
   },
   computed: {
     materialCheck() {
-      return (this.premise?.material.part_number != null && this.premise?.hs_code != null && this.premise?.tariff_rate != null)
+      return (this.premise?.material.part_number != null && this.premise?.tariff_rate != null)
     },
     priceCheck() {
       return (this.premise?.material_cost != null && this.premise?.oversea_share != null);
@@ -295,7 +302,7 @@ export default {
       if (((this.destinations ?? null) === null) || this.destinations.length === 0)
         return true;
 
-      return !this.destinations?.some(d => d.annual_amount == null);
+      return !this.destinations?.some(d => !d.annual_amount);
 
     },
     routeCheck() {
@@ -303,7 +310,7 @@ export default {
       if (((this.destinations ?? null) === null) || this.destinations.length === 0)
         return true;
 
-      return this.destinations?.every(d => d.routes?.some((route) => route.is_selected));
+      return this.destinations?.every(d => (d.is_d2d && d.rate_d2d && d.lead_time_d2d) || (!d.is_d2d && d.routes?.some((route) => route.is_selected)));
     },
     isSelected() {
       return this.premiseEditStore.isChecked(this.id);
diff --git a/src/frontend/src/components/layout/edit/destination/DestinationEditRoutes.vue b/src/frontend/src/components/layout/edit/destination/DestinationEditRoutes.vue
index d2b3f5e..2dcbb27 100644
--- a/src/frontend/src/components/layout/edit/destination/DestinationEditRoutes.vue
+++ b/src/frontend/src/components/layout/edit/destination/DestinationEditRoutes.vue
@@ -164,7 +164,7 @@ export default {
     },
     rateD2d: {
       get() {
-        return this.destination.rate_d2d?.toFixed(2) ?? '0.00';
+        return this.destination.rate_d2d?.toFixed(2) ?? null;
       },
       set(value) {
         this.destination && (this.destination.rate_d2d = value);
@@ -172,7 +172,7 @@ export default {
     },
     leadtimeD2d: {
       get() {
-        return this.destination.lead_time_d2d?.toFixed() ?? '0';
+        return this.destination.lead_time_d2d === 0 ? null : (this.destination.lead_time_d2d?.toFixed() ?? null);
       },
       set(value) {
         this.destination && (this.destination.lead_time_d2d = value);