Add filter for controllers and usb devices and clean class filter