diff --git a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
index f8fdba1c5f..6726d2ffaf 100644
--- a/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
+++ b/src/Simplex/Chat/Store/SQLite/Migrations/chat_query_plans.txt
@@ -1529,6 +1529,15 @@ Plan:
 SEARCH connections USING INDEX idx_connections_via_contact_uri_hash (user_id=? AND via_contact_uri_hash=?)
 USE TEMP B-TREE FOR ORDER BY
 
+Query: 
+          SELECT badge_purchase_id FROM badge_purchases
+          WHERE user_id = ? AND purchase_priv_key IS NOT NULL
+          ORDER BY badge_purchase_id DESC
+          LIMIT 1
+        
+Plan:
+SEARCH badge_purchases USING INDEX idx_badge_purchases_user (user_id=?)
+
 Query: 
           SELECT c.connection_id, c.agent_conn_id, c.conn_level, c.via_contact, c.via_user_contact_link, c.via_group_link, c.group_link_id, c.xcontact_id, c.custom_user_profile_id,
             c.conn_status, c.conn_type, c.contact_conn_initiated, c.local_alias, c.contact_id, c.group_member_id, c.user_contact_link_id,
@@ -4034,13 +4043,11 @@ Query:
                p.alert_acked_kind, p.alert_acked_episode, p.alert_snooze_until
         FROM badge_purchases p
         JOIN users u ON u.user_id = p.user_id
-        WHERE p.user_id = ? AND p.purchase_priv_key IS NOT NULL
-        ORDER BY p.badge_purchase_id DESC
-        LIMIT 1
+        WHERE p.badge_purchase_id = ? AND p.purchase_priv_key IS NOT NULL
       
 Plan:
+SEARCH p USING INTEGER PRIMARY KEY (rowid=?)
 SEARCH u USING INTEGER PRIMARY KEY (rowid=?)
-SEARCH p USING INDEX idx_badge_purchases_user (user_id=?)
 
 Query: 
         SELECT pgm.message_id, m.shared_msg_id, m.msg_body, m.msg_chat_binding, m.msg_signatures
@@ -4276,6 +4283,14 @@ SEARCH connections USING INDEX idx_connections_group_member_id (group_member_id=
 LIST SUBQUERY 1
 SCAN group_members USING COVERING INDEX idx_group_members_user_id_local_display_name
 
+Query: 
+        UPDATE contact_profiles
+        SET badge_proof = ?, badge_pres_header = ?, badge_expiry = ?, badge_type = ?, badge_verified = ?, badge_extra = ?, badge_master_key = ?, badge_signature = ?, badge_key_idx = ?, updated_at = ?
+        WHERE user_id = ? AND contact_profile_id = ?
+      
+Plan:
+SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
+
 Query: 
         UPDATE group_members
         SET contact_id = ?, local_display_name = ?, contact_profile_id = ?, updated_at = ?
@@ -5292,14 +5307,6 @@ Query:
 Plan:
 SEARCH connections_sync USING INTEGER PRIMARY KEY (rowid=?)
 
-Query: 
-      UPDATE contact_profiles
-      SET badge_proof = ?, badge_pres_header = ?, badge_expiry = ?, badge_type = ?, badge_verified = ?, badge_extra = ?, badge_master_key = ?, badge_signature = ?, badge_key_idx = ?, updated_at = ?
-      WHERE user_id = ? AND contact_profile_id = ?
-    
-Plan:
-SEARCH contact_profiles USING INTEGER PRIMARY KEY (rowid=?)
-
 Query: 
       UPDATE contact_profiles
       SET contact_link = ?, updated_at = ?
@@ -7325,6 +7332,10 @@ Query: SELECT badge_purchase_id FROM badge_purchases WHERE badge_code_redemption
 Plan:
 SEARCH badge_purchases USING COVERING INDEX idx_badge_purchases_code_redemption (badge_code_redemption_id=?)
 
+Query: SELECT balance_checked FROM badge_ledger ORDER BY entry_id
+Plan:
+SCAN badge_ledger
+
 Query: SELECT c.agent_conn_id FROM connections c JOIN group_members m ON m.group_member_id = c.group_member_id WHERE m.local_display_name = ?
 Plan:
 SCAN m USING COVERING INDEX idx_group_members_user_id_local_display_name