diff --git a/quirks/30-vendor-a4tech.quirks b/quirks/30-vendor-a4tech.quirks
index 274c63fc..aabfc3f6 100644
--- a/quirks/30-vendor-a4tech.quirks
+++ b/quirks/30-vendor-a4tech.quirks
@@ -1,7 +1,8 @@
 # Do not edit this file, it will be overwritten on update
 
 [A4TECH USB X-710BK]
+MatchUdevType=mouse
+MatchBus=usb
 MatchVendor=0x09DA
 MatchProduct=0x9090
-MatchUdevType=mouse
 ModelBouncingKeys=1
diff --git a/quirks/30-vendor-contour.quirks b/quirks/30-vendor-contour.quirks
index 2e10ff5b..a225af01 100644
--- a/quirks/30-vendor-contour.quirks
+++ b/quirks/30-vendor-contour.quirks
@@ -1,37 +1,43 @@
 # Do not edit this file, it will be overwritten on update
 
 [Contour Design RollerMouse Free 2]
+MatchUdevType=mouse
+MatchBus=usb
 MatchVendor=0x0B33
 MatchProduct=0x0401
-MatchUdevType=mouse
 ModelBouncingKeys=1
 
 [Contour Design RollerMouse Free 3]
+MatchUdevType=mouse
+MatchBus=usb
 MatchVendor=0x0B33
 MatchProduct=0x0404
-MatchUdevType=mouse
 ModelBouncingKeys=1
 
 [Contour Design RollerMouse Re:d]
+MatchUdevType=mouse
+MatchBus=usb
 MatchVendor=0x0B33
 MatchProduct=0x1000
-MatchUdevType=mouse
 ModelBouncingKeys=1
 
 [Contour Design RollerMouse Red v3]
+MatchUdevType=mouse
+MatchBus=usb
 MatchVendor=0x0B33
 MatchProduct=0x1004
-MatchUdevType=mouse
 ModelBouncingKeys=1
 
 [Contour Design RollerMouse Pro3]
+MatchUdevType=mouse
+MatchBus=usb
 MatchVendor=0x0B33
 MatchProduct=0x0703
-MatchUdevType=mouse
 ModelBouncingKeys=1
 
 [Contour Design RollerMouse USB Receiver]
+MatchUdevType=mouse
+MatchBus=usb
 MatchVendor=0x0B33
 MatchProduct=0x2000
-MatchUdevType=mouse
 ModelBouncingKeys=1
diff --git a/quirks/30-vendor-cypress.quirks b/quirks/30-vendor-cypress.quirks
index 7d416df4..31c7d87b 100644
--- a/quirks/30-vendor-cypress.quirks
+++ b/quirks/30-vendor-cypress.quirks
@@ -1,10 +1,13 @@
 # Do not edit this file, it will be overwritten on update
 
 [Cyapa Touchpads]
+MatchBus=i2c
+MatchUdevType=touchpad
 MatchName=*Cypress APA Trackpad ?cyapa?
 AttrPressureRange=10:8
 
 [Cypress Touchpads]
+MatchBus=ps2
 MatchUdevType=touchpad
 MatchName=*CyPS/2 Cypress Trackpad
 AttrPressureRange=10:8
diff --git a/quirks/30-vendor-huion.quirks b/quirks/30-vendor-huion.quirks
index f61c7a42..48994c54 100644
--- a/quirks/30-vendor-huion.quirks
+++ b/quirks/30-vendor-huion.quirks
@@ -4,5 +4,6 @@
 # re-use the same vendor ID 256C.
 [Huion/Gaomon Tablets]
 MatchUdevType=tablet
+MatchBus=usb
 MatchVendor=0x256C
 AttrResolutionHint=205x328