diff --git a/ereuse_devicehub/inventory/forms.py b/ereuse_devicehub/inventory/forms.py
index 41505a8a..b86dca83 100644
--- a/ereuse_devicehub/inventory/forms.py
+++ b/ereuse_devicehub/inventory/forms.py
@@ -88,7 +88,7 @@ DEVICES = {
     ],
     "Drives & Storage": [
         "All DataStorage",
-        "HardDrives",
+        "HardDrive",
         "SolidStageDrive",
     ],
 }
diff --git a/ereuse_devicehub/resources/device/models.py b/ereuse_devicehub/resources/device/models.py
index 0f398737..35e4d559 100644
--- a/ereuse_devicehub/resources/device/models.py
+++ b/ereuse_devicehub/resources/device/models.py
@@ -632,6 +632,14 @@ class Device(Thing):
             return self.binding.device.devicehub_id
         return self.devicehub_id
 
+    @property
+    def my_partner(self):
+        if self.placeholder and self.placeholder.binding:
+            return self.placeholder.binding
+        if self.binding:
+            return self.binding.device
+        return self
+
     @property
     def get_updated(self):
         if self.placeholder and self.placeholder.binding:
diff --git a/ereuse_devicehub/templates/inventory/erasure_list.html b/ereuse_devicehub/templates/inventory/erasure_list.html
index adaec94f..7573bb4b 100644
--- a/ereuse_devicehub/templates/inventory/erasure_list.html
+++ b/ereuse_devicehub/templates/inventory/erasure_list.html
@@ -128,7 +128,7 @@
                     {% for ac in erasure %}
                     <tr>
                       <td>
-                          <input type="checkbox" class="deviceSelect" data="{{ ac.device.id }}"
+                          <input type="checkbox" class="deviceSelect" data="{{ ac.device.my_partner.id }}"
                                data-device-type="{{ ac.device.type }}" data-device-manufacturer="{{ ac.device.manufacturer }}"
                                data-device-dhid="{{ ac.device.dhid }}" data-device-vname="{{ ac.device.verbose_name }}"
                                data-action-erasure="{{ ac.id }}"
@@ -151,9 +151,9 @@
                         {% endif %}
                         {{ ac.device.serial_number.upper() }}
                         {% endif %}
-                        {% if ac.device.lots | length > 0 %}
+                        {% if ac.device.my_partner.lots | length > 0 %}
                         <h6 class="d-inline">
-                          {% for lot in ac.device.get_lots_for_template() %}
+                          {% for lot in ac.device.my_partner.get_lots_for_template() %}
                             <span class="badge rounded-pill bg-light text-dark">{{ lot }}</span>
                           {% endfor %}
                         </h6>