improve DeviceQuery(KEYWORD=DEVICE-ID) search function