diff --git a/templates/ceph_info_html.j2 b/templates/ceph_info_html.j2
index 1e461c8..eafa2fa 100644
--- a/templates/ceph_info_html.j2
+++ b/templates/ceph_info_html.j2
@@ -888,14 +888,24 @@
         <tr class="node">
             <td class="dev_name">
                 <div class="text">{{ _p['model_name'] }}, {{ _p['serial_number'] }}</div><br>
-                <div class="note">{{ _p['model_family'] }}; {{ _p['sata_version']['string'] }}</div>
-                <div class="note">{{ _d }}</div>
+                {% if "model_family" in _p %}
+                <div class="note">{{ _p['model_family'] }}</div>
+                {% endif %}
+                <div class="note">{{ _p['node_name'] }}:{{ _p['osd_name'] }}</div>
             </td>
             <td class="dev_param centered">{{ _p['device']['info_name'] }}</td>
             <td class="dev_param centered">{{ _p['device']['protocol'] }}</td>
             <td class="dev_param centered">{{ _p['firmware_version'] }}</td>
+            {% if "interface_speed" in _p %}
             <td class="dev_param centered">{{ _p['interface_speed']['current']['string'] }} / {{ _p['interface_speed']['max']['string'] }}</td>
+            {% else %}
+            <td class="dev_param centered">- / -</td>
+            {% endif%}
+            {% if "physical_block_size" in _p %}
             <td class="dev_param centered">{{ _p['physical_block_size'] }} / {{ _p['logical_block_size'] }}</td>
+            {% else %}
+            <td class="dev_param centered">- / {{ _p['logical_block_size'] }}</td>
+            {% endif %}
             <td class="dev_param centered">{{ _p['power_cycle_count'] }}</td>
             <td class="dev_param centered">{{ _p['temperature']['current'] }}</td>
             {% if _p['smart_status']['passed'] %}