diff --git a/src/components/AddInventoryFilterOptionsModal.vue b/src/components/AddInventoryFilterOptionsModal.vue
index 915b511..b1fcd28 100644
--- a/src/components/AddInventoryFilterOptionsModal.vue
+++ b/src/components/AddInventoryFilterOptionsModal.vue
@@ -80,7 +80,7 @@ let enumerations = ref([]) as any
 let areFiltersUpdated = ref(false)
 
 // Added those enums here that needs to be hidden form the UI
-const hiddenOptions = ["IIP_MSMNT_SYSTEM", "IIP_SPLIT_ITEM_GROUP", "IFP_SHIP_THREHOLD"]
+const hiddenOptions = ["IIP_MSMNT_SYSTEM", "IIP_SPLIT_ITEM_GROUP"]
 
 // Add entries for the enums those are dependent on another filter {enumId: { code, label }}
 const dependentOptions = {"ISP_CUST_SEQ": { code: "facilityGroupId", label: "Facility group" }} as any
diff --git a/src/views/BrokeringQuery.vue b/src/views/BrokeringQuery.vue
index 0992058..3bf8d3b 100644
--- a/src/views/BrokeringQuery.vue
+++ b/src/views/BrokeringQuery.vue
@@ -289,9 +289,8 @@
                   </ion-toggle>
                 </ion-item>
                 <ion-item v-if="getFilterValue(inventoryRuleFilterOptions, conditionFilterEnums, 'SHIP_THREHOLD')">
-                  <ion-toggle :checked="getFilterValue(inventoryRuleFilterOptions, conditionFilterEnums, 'SHIP_THREHOLD').fieldValue === 'Y'" @ionChange="updateRuleFilterValue($event, 'SHIP_THREHOLD')">
-                    {{ translate("Shipment threshold check") }}
-                  </ion-toggle>
+                  <ion-label>{{ translate('Shipment threshold check') }}</ion-label>
+                  <ion-chip slot="end" outline @click="selectValue('SHIP_THREHOLD', 'Add shipment threshold check')">{{ getFilterValue(inventoryRuleFilterOptions, conditionFilterEnums, "SHIP_THREHOLD").fieldValue || getFilterValue(inventoryRuleFilterOptions, conditionFilterEnums, "SHIP_THREHOLD").fieldValue == 0 ? getFilterValue(inventoryRuleFilterOptions, conditionFilterEnums, "SHIP_THREHOLD").fieldValue : "-" }}</ion-chip>
                 </ion-item>
               </ion-card>
               <ion-card>
@@ -1034,8 +1033,6 @@ function updateOrderFilterValue(event: CustomEvent, id: string, multi = false) {
 function updateRuleFilterValue(event: CustomEvent, id: string) {
   if(id === "FACILITY_ORDER_LIMIT") {
     inventoryRuleFilterOptions.value[conditionFilterEnums[id].code].fieldValue = event.detail.checked ? "Y" : "N"
-  } else if(id === "SHIP_THREHOLD") {
-    inventoryRuleFilterOptions.value[conditionFilterEnums[id].code].fieldValue = event.detail.checked ? "Y" : "N"
   } else {
     inventoryRuleFilterOptions.value[conditionFilterEnums[id].code].fieldValue = event.detail.value
   }