diff --git a/lib/subghz/protocols/keeloq.c b/lib/subghz/protocols/keeloq.c
index 6c7e074fe..9b86eb5e8 100644
--- a/lib/subghz/protocols/keeloq.c
+++ b/lib/subghz/protocols/keeloq.c
@@ -739,14 +739,19 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
     uint8_t btn = (uint8_t)(fix >> 28);
     uint32_t decrypt = 0;
     uint64_t man;
-    int res = 0;
+    bool mf_not_set = false;
     if(mfname == 0x0) {
         mfname = "";
     }
 
-    if(strcmp(mfname, "") == 0) {
-        for
-            M_EACH(manufacture_code, *subghz_keystore_get_data(keystore), SubGhzKeyArray_t) {
+    if(strcmp(mfname, "Unknown") == 0) {
+        return 1;
+    } else if(strcmp(mfname, "") == 0) {
+        mf_not_set = true;
+    }
+    for
+        M_EACH(manufacture_code, *subghz_keystore_get_data(keystore), SubGhzKeyArray_t) {
+            if(mf_not_set || (strcmp(furi_string_get_cstr(manufacture_code->name), mfname) == 0)) {
                 switch(manufacture_code->type) {
                 case KEELOQ_LEARNING_SIMPLE:
                     // Simple Learning
@@ -800,23 +805,29 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
                     }
                     break;
                 case KEELOQ_LEARNING_MAGIC_SERIAL_TYPE_2:
-                    man = subghz_protocol_keeloq_common_magic_serial_type2_learning(
-                        fix, manufacture_code->key);
-                    decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                    if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
-                        *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                        mfname = *manufacture_name;
-                        return 1;
+                    if(mf_not_set) {
+                        man = subghz_protocol_keeloq_common_magic_serial_type2_learning(
+                            fix, manufacture_code->key);
+                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
+                        if(subghz_protocol_keeloq_check_decrypt(
+                               instance, decrypt, btn, end_serial)) {
+                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
+                            mfname = *manufacture_name;
+                            return 1;
+                        }
                     }
                     break;
                 case KEELOQ_LEARNING_MAGIC_SERIAL_TYPE_3:
-                    man = subghz_protocol_keeloq_common_magic_serial_type3_learning(
-                        fix, manufacture_code->key);
-                    decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                    if(subghz_protocol_keeloq_check_decrypt(instance, decrypt, btn, end_serial)) {
-                        *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                        mfname = *manufacture_name;
-                        return 1;
+                    if(mf_not_set) {
+                        man = subghz_protocol_keeloq_common_magic_serial_type3_learning(
+                            fix, manufacture_code->key);
+                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
+                        if(subghz_protocol_keeloq_check_decrypt(
+                               instance, decrypt, btn, end_serial)) {
+                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
+                            mfname = *manufacture_name;
+                            return 1;
+                        }
                     }
                     break;
                 case KEELOQ_LEARNING_UNKNOWN:
@@ -914,174 +925,7 @@ static uint8_t subghz_protocol_keeloq_check_remote_controller_selector(
                     break;
                 }
             }
-    } else if(strcmp(mfname, "Unknown") == 0) {
-        return 1;
-    } else {
-        for
-            M_EACH(manufacture_code, *subghz_keystore_get_data(keystore), SubGhzKeyArray_t) {
-                res = strcmp(furi_string_get_cstr(manufacture_code->name), mfname);
-                if(res == 0) {
-                    switch(manufacture_code->type) {
-                    case KEELOQ_LEARNING_SIMPLE:
-                        // Simple Learning
-                        decrypt =
-                            subghz_protocol_keeloq_common_decrypt(hop, manufacture_code->key);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            return 1;
-                        }
-                        break;
-                    case KEELOQ_LEARNING_NORMAL:
-                        // Normal Learning
-                        // https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37
-                        man = subghz_protocol_keeloq_common_normal_learning(
-                            fix, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            return 1;
-                        }
-                        break;
-                    case KEELOQ_LEARNING_SECURE:
-                        man = subghz_protocol_keeloq_common_secure_learning(
-                            fix, instance->seed, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            return 1;
-                        }
-                        break;
-                    case KEELOQ_LEARNING_MAGIC_XOR_TYPE_1:
-                        man = subghz_protocol_keeloq_common_magic_xor_type1_learning(
-                            fix, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            return 1;
-                        }
-                        break;
-                    case KEELOQ_LEARNING_MAGIC_SERIAL_TYPE_1:
-                        man = subghz_protocol_keeloq_common_magic_serial_type1_learning(
-                            fix, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            return 1;
-                        }
-                        break;
-                    case KEELOQ_LEARNING_UNKNOWN:
-                        // Simple Learning
-                        decrypt =
-                            subghz_protocol_keeloq_common_decrypt(hop, manufacture_code->key);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 1;
-                            return 1;
-                        }
-                        // Check for mirrored man
-                        uint64_t man_rev = 0;
-                        uint64_t man_rev_byte = 0;
-                        for(uint8_t i = 0; i < 64; i += 8) {
-                            man_rev_byte = (uint8_t)(manufacture_code->key >> i);
-                            man_rev = man_rev | man_rev_byte << (56 - i);
-                        }
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_rev);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 1;
-                            return 1;
-                        }
-                        //###########################
-                        // Normal Learning
-                        // https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37
-                        man = subghz_protocol_keeloq_common_normal_learning(
-                            fix, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 2;
-                            return 1;
-                        }
-
-                        // Check for mirrored man
-                        man = subghz_protocol_keeloq_common_normal_learning(fix, man_rev);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 2;
-                            return 1;
-                        }
-
-                        // Secure Learning
-                        man = subghz_protocol_keeloq_common_secure_learning(
-                            fix, instance->seed, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 3;
-                            return 1;
-                        }
-
-                        // Check for mirrored man
-                        man = subghz_protocol_keeloq_common_secure_learning(
-                            fix, instance->seed, man_rev);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 3;
-                            return 1;
-                        }
-
-                        // Magic xor type1 learning
-                        man = subghz_protocol_keeloq_common_magic_xor_type1_learning(
-                            fix, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 4;
-                            return 1;
-                        }
-
-                        // Check for mirrored man
-                        man = subghz_protocol_keeloq_common_magic_xor_type1_learning(fix, man_rev);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man);
-                        if(subghz_protocol_keeloq_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 4;
-                            return 1;
-                        }
-
-                        break;
-                    }
-                }
-            }
-    }
+        }
 
     *manufacture_name = "Unknown";
     mfname = "Unknown";
diff --git a/lib/subghz/protocols/star_line.c b/lib/subghz/protocols/star_line.c
index 792622412..83a4846cd 100644
--- a/lib/subghz/protocols/star_line.c
+++ b/lib/subghz/protocols/star_line.c
@@ -522,14 +522,19 @@ static uint8_t subghz_protocol_star_line_check_remote_controller_selector(
     uint8_t btn = (uint8_t)(fix >> 24);
     uint32_t decrypt = 0;
     uint64_t man_normal_learning;
-    int res = 0;
+    bool mf_not_set = false;
     if(mfname == 0x0) {
         mfname = "";
     }
 
-    if(strcmp(mfname, "") == 0) {
-        for
-            M_EACH(manufacture_code, *subghz_keystore_get_data(keystore), SubGhzKeyArray_t) {
+    if(strcmp(mfname, "Unknown") == 0) {
+        return 1;
+    } else if(strcmp(mfname, "") == 0) {
+        mf_not_set = true;
+    }
+    for
+        M_EACH(manufacture_code, *subghz_keystore_get_data(keystore), SubGhzKeyArray_t) {
+            if(mf_not_set || strcmp(furi_string_get_cstr(manufacture_code->name), mfname)) {
                 switch(manufacture_code->type) {
                 case KEELOQ_LEARNING_SIMPLE:
                     // Simple Learning
@@ -606,94 +611,7 @@ static uint8_t subghz_protocol_star_line_check_remote_controller_selector(
                     break;
                 }
             }
-    } else if(strcmp(mfname, "Unknown") == 0) {
-        return 1;
-    } else {
-        for
-            M_EACH(manufacture_code, *subghz_keystore_get_data(keystore), SubGhzKeyArray_t) {
-                res = strcmp(furi_string_get_cstr(manufacture_code->name), mfname);
-                if(res == 0) {
-                    switch(manufacture_code->type) {
-                    case KEELOQ_LEARNING_SIMPLE:
-                        // Simple Learning
-                        decrypt =
-                            subghz_protocol_keeloq_common_decrypt(hop, manufacture_code->key);
-                        if(subghz_protocol_star_line_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            return 1;
-                        }
-                        break;
-                    case KEELOQ_LEARNING_NORMAL:
-                        // Normal Learning
-                        // https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37
-                        man_normal_learning = subghz_protocol_keeloq_common_normal_learning(
-                            fix, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning);
-                        if(subghz_protocol_star_line_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            return 1;
-                        }
-                        break;
-                    case KEELOQ_LEARNING_UNKNOWN:
-                        // Simple Learning
-                        decrypt =
-                            subghz_protocol_keeloq_common_decrypt(hop, manufacture_code->key);
-                        if(subghz_protocol_star_line_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 1;
-                            return 1;
-                        }
-                        // Check for mirrored man
-                        uint64_t man_rev = 0;
-                        uint64_t man_rev_byte = 0;
-                        for(uint8_t i = 0; i < 64; i += 8) {
-                            man_rev_byte = (uint8_t)(manufacture_code->key >> i);
-                            man_rev = man_rev | man_rev_byte << (56 - i);
-                        }
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_rev);
-                        if(subghz_protocol_star_line_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 1;
-                            return 1;
-                        }
-                        //###########################
-                        // Normal Learning
-                        // https://phreakerclub.com/forum/showpost.php?p=43557&postcount=37
-                        man_normal_learning = subghz_protocol_keeloq_common_normal_learning(
-                            fix, manufacture_code->key);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning);
-                        if(subghz_protocol_star_line_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 2;
-                            return 1;
-                        }
-
-                        // Check for mirrored man
-                        man_normal_learning =
-                            subghz_protocol_keeloq_common_normal_learning(fix, man_rev);
-                        decrypt = subghz_protocol_keeloq_common_decrypt(hop, man_normal_learning);
-                        if(subghz_protocol_star_line_check_decrypt(
-                               instance, decrypt, btn, end_serial)) {
-                            *manufacture_name = furi_string_get_cstr(manufacture_code->name);
-                            mfname = *manufacture_name;
-                            kl_type = 2;
-                            return 1;
-                        }
-                        break;
-                    }
-                }
-            }
-    }
+        }
 
     *manufacture_name = "Unknown";
     mfname = "Unknown";