diff --git a/codeflash/cli_cmds/cmd_init.py b/codeflash/cli_cmds/cmd_init.py
index 2b4e0e26b..f2cd3e969 100644
--- a/codeflash/cli_cmds/cmd_init.py
+++ b/codeflash/cli_cmds/cmd_init.py
@@ -1228,13 +1228,16 @@ def enter_api_key_and_save_to_rc() -> None:
 
 
 def create_find_common_tags_file(args: Namespace, file_name: str) -> Path:
-    find_common_tags_content = """def find_common_tags(articles: list[dict[str, list[str]]]) -> set[str]:
+    find_common_tags_content = """from __future__ import annotations
+
+
+def find_common_tags(articles: list[dict[str, list[str]]]) -> set[str]:
     if not articles:
         return set()
 
-    common_tags = articles[0]["tags"]
+    common_tags = articles[0].get("tags", [])
     for article in articles[1:]:
-        common_tags = [tag for tag in common_tags if tag in article["tags"]]
+        common_tags = [tag for tag in common_tags if tag in article.get("tags", [])]
     return set(common_tags)
 """