diff --git a/app.py b/app.py
index 2ca8e91..2bf9922 100644
--- a/app.py
+++ b/app.py
@@ -633,7 +633,9 @@ def create_app(config_object="config"):
     def device_list():
         devices = db.query(Device).order_by(Device.name).all()
         device_types = sorted({d.device_type for d in devices if d.device_type})
-        return render_template("device_list.html", devices=devices, device_types=device_types)
+        device_locations = sorted({d.location for d in devices if d.location})
+        return render_template("device_list.html", devices=devices,
+                               device_types=device_types, device_locations=device_locations)
 
     # ------------------------------------------------------------------ #
     # Devices — add
diff --git a/templates/device_list.html b/templates/device_list.html
index 49ef61c..6e6d84e 100644
--- a/templates/device_list.html
+++ b/templates/device_list.html
@@ -13,6 +13,20 @@
       <option value="{{ t }}">{{ t }}</option>
       {% endfor %}
     </select>
+    <select id="filter-location" onchange="applyDeviceFilters()"
+            style="padding:0.25rem 0.5rem;font-size:0.85rem;border:1px solid #cbd5e1;border-radius:4px;">
+      <option value="">All Locations</option>
+      {% for loc in device_locations|default([]) %}
+      <option value="{{ loc }}">{{ loc }}</option>
+      {% endfor %}
+    </select>
+    <select id="filter-fill" onchange="applyDeviceFilters()"
+            style="padding:0.25rem 0.5rem;font-size:0.85rem;border:1px solid #cbd5e1;border-radius:4px;">
+      <option value="">Any Fill</option>
+      <option value="empty">Empty</option>
+      <option value="partial">Partial</option>
+      <option value="full">Full</option>
+    </select>
     <input type="text" id="filter-device-text" oninput="applyDeviceFilters()" placeholder="Search…"
            style="padding:0.25rem 0.5rem;font-size:0.85rem;border:1px solid #cbd5e1;border-radius:4px;width:140px;">
     <button type="button" onclick="resetDeviceFilters()" class="btn btn-sm btn-secondary"
@@ -26,6 +40,7 @@
         <tr>
           <th>Name</th>
           <th>Type</th>
+          <th>Location</th>
           <th>Slots</th>
           <th>Installed</th>
           <th>Brands</th>
@@ -34,13 +49,21 @@
       </thead>
       <tbody>
         {% for d in devices %}
-        <tr data-type="{{ d.device_type or '' }}" data-name="{{ d.name|lower }}">
+        {% set installed = d.installed_count() %}
+        {% if installed == 0 %}{% set fill_state = 'empty' %}
+        {% elif installed >= d.battery_slots %}{% set fill_state = 'full' %}
+        {% else %}{% set fill_state = 'partial' %}{% endif %}
+        <tr data-type="{{ d.device_type or '' }}"
+            data-location="{{ d.location or '' }}"
+            data-fill="{{ fill_state }}"
+            data-name="{{ d.name|lower }}">
           <td data-label="Device"><a href="{{ url_for('device_detail', device_id=d.id) }}"><strong>{{ d.name }}</strong></a></td>
           <td data-label="Type">{{ d.device_type or '—' }}</td>
+          <td data-label="Location">{{ d.location or '—' }}</td>
           <td data-label="Slots">{{ d.battery_slots }}</td>
           <td data-label="Installed">
-            {{ d.installed_count() }} / {{ d.battery_slots }}
-            {% if d.installed_count() >= d.battery_slots %}
+            {{ installed }} / {{ d.battery_slots }}
+            {% if installed >= d.battery_slots %}
               <span class="badge badge-retired">Full</span>
             {% endif %}
           </td>
@@ -57,7 +80,7 @@
           </td>
           <td data-label="Actions" style="white-space:nowrap;">
             <a class="btn btn-sm btn-secondary" href="{{ url_for('device_detail', device_id=d.id) }}">View</a>
-            {% if d.installed_count() > 0 %}
+            {% if installed > 0 %}
             <form class="inline" method="post" action="{{ url_for('device_unassign_all', device_id=d.id) }}"
                   data-confirm="Unassign all batteries from {{ d.name }}?"
                   data-confirm-ok="Unassign" data-confirm-class="btn-warning">
@@ -72,7 +95,7 @@
           </td>
         </tr>
         {% else %}
-        <tr><td colspan="6" class="text-muted" style="text-align:center;padding:1rem;">No devices yet. <a href="{{ url_for('device_add') }}">Add one.</a></td></tr>
+        <tr><td colspan="7" class="text-muted" style="text-align:center;padding:1rem;">No devices yet. <a href="{{ url_for('device_add') }}">Add one.</a></td></tr>
         {% endfor %}
       </tbody>
     </table>
@@ -83,19 +106,27 @@
 
 <script>
 function applyDeviceFilters() {
-  var typeVal  = document.getElementById('filter-type').value.toLowerCase();
-  var textVal  = document.getElementById('filter-device-text').value.toLowerCase();
-  var rows     = document.querySelectorAll('tbody tr[data-name]');
-  var visible  = 0;
+  var typeVal     = document.getElementById('filter-type').value;
+  var locationVal = document.getElementById('filter-location').value;
+  var fillVal     = document.getElementById('filter-fill').value;
+  var textVal     = document.getElementById('filter-device-text').value.toLowerCase();
+  var rows        = document.querySelectorAll('tbody tr[data-name]');
+  var visible     = 0;
   rows.forEach(function(row) {
-    var rowType = (row.dataset.type || '').toLowerCase();
-    var rowName = (row.dataset.name || '').toLowerCase();
-    var show = (!typeVal || rowType === typeVal) &&
-               (!textVal || rowName.includes(textVal) || rowType.includes(textVal));
+    var rowType     = row.dataset.type     || '';
+    var rowLocation = row.dataset.location || '';
+    var rowFill     = row.dataset.fill     || '';
+    var rowName     = row.dataset.name     || '';
+    var show = (!typeVal     || rowType === typeVal) &&
+               (!locationVal || rowLocation === locationVal) &&
+               (!fillVal     || rowFill === fillVal) &&
+               (!textVal     || rowName.includes(textVal) ||
+                                rowType.toLowerCase().includes(textVal) ||
+                                rowLocation.toLowerCase().includes(textVal));
     row.style.display = show ? '' : 'none';
     if (show) visible++;
   });
-  var active = typeVal || textVal;
+  var active = typeVal || locationVal || fillVal || textVal;
   document.getElementById('device-filter-reset').style.display = active ? '' : 'none';
   document.getElementById('device-filter-count').textContent =
     active ? (visible + ' of ' + rows.length + ' shown') : '';
@@ -103,6 +134,8 @@ function applyDeviceFilters() {
 
 function resetDeviceFilters() {
   document.getElementById('filter-type').value = '';
+  document.getElementById('filter-location').value = '';
+  document.getElementById('filter-fill').value = '';
   document.getElementById('filter-device-text').value = '';
   applyDeviceFilters();
 }