diff --git a/schemas/app/BatchNumber.json b/schemas/app/BatchNumber.json
index 247547f8..3f2bdb7f 100644
--- a/schemas/app/BatchNumber.json
+++ b/schemas/app/BatchNumber.json
@@ -25,5 +25,6 @@
             "required": false
         }
     ],
-    "quickEditFields": ["batchNumber", "expiryDate", "manufactureDate"]
+    "quickEditFields": ["batchNumber", "expiryDate", "manufactureDate"],
+    "keywordFields": ["name"]
 }
\ No newline at end of file
diff --git a/schemas/app/InvoiceItem.json b/schemas/app/InvoiceItem.json
index 082ac3e0..b42cf8e9 100644
--- a/schemas/app/InvoiceItem.json
+++ b/schemas/app/InvoiceItem.json
@@ -103,7 +103,7 @@
       "placeholder": "Batch No"
     }
   ],
-  "tableFields": ["item", "tax", "quantity", "rate", "amount", "batchNumber"],
+  "tableFields": ["item", "tax", "batchNumber", "quantity", "rate", "amount"],
   "keywordFields": ["item", "tax"],
   "quickEditFields": [
     "item",
@@ -111,6 +111,7 @@
     "description",
     "hsnCode",
     "tax",
+    "batchNumber",
     "quantity",
     "rate",
     "amount",
@@ -118,7 +119,6 @@
     "itemDiscountAmount",
     "itemDiscountPercent",
     "itemDiscountedTotal",
-    "itemTaxedTotal",
-    "batchNumber"
+    "itemTaxedTotal"
   ]
 }
diff --git a/schemas/app/Item.json b/schemas/app/Item.json
index f3bd5eb2..0d1b1adb 100644
--- a/schemas/app/Item.json
+++ b/schemas/app/Item.json
@@ -122,7 +122,6 @@
   "quickEditFields": [
     "rate",
     "unit",
-    "hasBatchNumber",
     "itemType",
     "for",
     "tax",
@@ -130,7 +129,8 @@
     "incomeAccount",
     "expenseAccount",
     "hsnCode",
-    "trackItem"
+    "trackItem",
+    "hasBatchNumber"
   ],
   "keywordFields": ["name", "itemType", "for"]
 }
diff --git a/schemas/app/inventory/StockTransferItem.json b/schemas/app/inventory/StockTransferItem.json
index 2390257a..240eca17 100644
--- a/schemas/app/inventory/StockTransferItem.json
+++ b/schemas/app/inventory/StockTransferItem.json
@@ -20,7 +20,8 @@
     {
       "fieldname": "batchNumber",
       "label": "Batch No",
-      "fieldtype": "Data"
+      "fieldtype": "Link",
+      "target": "BatchNumber"
     },
     {
       "fieldname": "quantity",
@@ -62,13 +63,14 @@
       "placeholder": "HSN/SAC Code"
     }
   ],
-  "tableFields": ["item", "location", "quantity", "rate", "amount"],
+  "tableFields": ["item", "location", "batchNumber", "quantity", "rate", "amount"],
   "quickEditFields": [
     "item",
     "unit",
     "description",
     "hsnCode",
     "location",
+    "batchNumber",
     "quantity",
     "rate",
     "amount"