diff --git a/model/sqlite_sql_requests.py b/model/sqlite_sql_requests.py
index 4439c7d..23b0aa8 100644
--- a/model/sqlite_sql_requests.py
+++ b/model/sqlite_sql_requests.py
@@ -10,10 +10,12 @@ squads_by_tag_extended_raw_keys = """select
     null_fdev(super_power_name) as super_power_name,
     null_fdev(faction_name) as faction_name,
     user_tags,
-    inserted_timestamp,
+    max(inserted_timestamp) as inserted_timestamp,
     squad_id
-from squads_view
-where tag = :tag
+from squads_states 
+where tag = :tag 
+and squad_id not in (select squad_id from squads_states where tag is null)
+group by platform 
 order by platform;
 """
 
diff --git a/sql_schema.sql b/sql_schema.sql
index d0f9d79..e29e4b5 100644
--- a/sql_schema.sql
+++ b/sql_schema.sql
@@ -37,6 +37,8 @@ current_season_aegis_score int,
 previous_season_aegis_score int,
 inserted_timestamp datetime default current_timestamp);
 
+create index if not exists idx_squads_states_1 on squads_states (tag) where tag is null;  --for squads_by_tag_extended_raw_keys req
+
 create view if not exists squads_view
 as
 select squad_id,