diff --git a/InvenTree/part/templates/part/bom.html b/InvenTree/part/templates/part/bom.html
index 512b6d2516..e607b9752f 100644
--- a/InvenTree/part/templates/part/bom.html
+++ b/InvenTree/part/templates/part/bom.html
@@ -13,7 +13,7 @@
 
 <h3>Bill of Materials</h3>
 
-<table class="table table-striped" id='bom-table' data-sorting='true'>
+<table class="table table-striped" id='bom-table' data-filtering='true' data-sorting='true'>
 <thead>
     <tr>
         <th>Part</th>
diff --git a/InvenTree/part/templates/part/stock.html b/InvenTree/part/templates/part/stock.html
index 60e34ac124..e2176afaec 100644
--- a/InvenTree/part/templates/part/stock.html
+++ b/InvenTree/part/templates/part/stock.html
@@ -10,7 +10,11 @@
 <thead>
 <tr>
     <th data-sortable='false'>Link</th>
+    {% if part.trackable %}
+    <th>Serial Number</th>
+    {% else %}
     <th>Quantity</th>
+    {% endif %}
     <th>Location</th>
     <th>Supplier part</th>
     <th>Stocktake</th>
@@ -21,7 +25,13 @@
 {% for stock in part.locations.all %}
 <tr>
     <td><a href="{% url 'stock-item-detail' stock.id %}">Click</a></td>
-    <td>{{ stock.quantity }}</td>
+    <td>
+        {% if part.trackable %}
+        {{ stock.serial }}
+        {% else %}
+        {{ stock.quantity }}
+        {% endif %}
+    </td>
     <td>
         {% if stock.location %}
         <a href="{% url 'stock-location-detail' stock.location.id %}">{{ stock.location.name }}</a>