diff --git a/src/components/Devices.js b/src/components/Devices.js
index 093efec..a0e6deb 100644
--- a/src/components/Devices.js
+++ b/src/components/Devices.js
@@ -24,7 +24,7 @@ const Devices = () => {
         setTestDate(null);
         setCurTest(null);
         setDays([...new Set(allTests
-            .filter((x) => x.deviceSerialNumber === value)
+            .filter((x) => x.deviceSerialNumber === value || x.deviceId === value)
             .map(x => moment(x.testTime).format("YYYY-MM-DD")))]
             .sort()
             .reverse());
@@ -36,7 +36,7 @@ const Devices = () => {
         setCurTestData(null);
         setShowGraph(false);
         setTests(allTests
-            .filter((x) => x.deviceSerialNumber === device && moment(x.testTime).isBetween(moment(value).startOf('day'), moment(value).endOf('day')))
+            .filter((x) => (x.deviceSerialNumber === device || x.deviceId === device) && moment(x.testTime).isBetween(moment(value).startOf('day'), moment(value).endOf('day')))
             .map(x => x._id)
             .sort());
     }
@@ -70,8 +70,13 @@ const Devices = () => {
                 querySnapshot.forEach((document) => {
                     const hposTestData = document.data();
                     hposTests.push(hposTestData);
-                    const { deviceSerialNumber } = hposTestData;
-                    testDevices.add(deviceSerialNumber);
+                    const { deviceType, deviceId, deviceSerialNumber } = hposTestData;
+                    if (deviceType === 'HEMOCUBE' && deviceId) {
+                        testDevices.add(deviceId);
+                    }
+                    if (deviceType !== 'HEMOCUBE' && deviceSerialNumber) {
+                        testDevices.add(deviceSerialNumber);
+                    }
                 });
                 const groups = [...testDevices];
                 setDevices(groups);