Huawei and other devices added; Fix for regex_not