diff --git a/VERSION b/VERSION
index 3eead35c..a2cf354d 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.17.3-develop96
+1.17.3-develop97
diff --git a/docs/defaults/overlays/flixpatrol.yml b/docs/defaults/overlays/flixpatrol.yml
index c6475b59..aa3e0a1e 100644
--- a/docs/defaults/overlays/flixpatrol.yml
+++ b/docs/defaults/overlays/flixpatrol.yml
@@ -33,6 +33,7 @@ templates:
       - use_<<key>>
       - time_window_<<key>>
       - location_<<key>>
+      - overlay_level
     default:
       style: round
       overlay: <<overlay_name>>
@@ -59,6 +60,7 @@ templates:
       limit: 10
       limit_<<key>>: <<limit>>
       weight_<<key>>: <<weight>>
+    overlay_level: <<overlay_level>>
     ignore_blank_results: true
     allowed_library_types: <<use_<<key>>>>
     overlay:
diff --git a/docs/defaults/overlays/streaming.yml b/docs/defaults/overlays/streaming.yml
index 7e3d8b3e..090dba6d 100644
--- a/docs/defaults/overlays/streaming.yml
+++ b/docs/defaults/overlays/streaming.yml
@@ -61,6 +61,7 @@ templates:
       back_radius: 30
       back_width: 305
       back_height: 105
+    overlay_level: <<overlay_level>>
     allowed_library_types: <<use_<<slug>>>>
     ignore_blank_results: true
     overlay:
diff --git a/modules/builder.py b/modules/builder.py
index 40cb2a66..0adfc044 100644
--- a/modules/builder.py
+++ b/modules/builder.py
@@ -1692,7 +1692,8 @@ class CollectionBuilder:
                                 self.missing_parts.append(f"{show_item.title} Season: {season_num} Episode: {episode_num} Missing")
                     if not found and tvdb_id not in self.missing_shows and self.do_missing:
                         self.missing_shows.append(tvdb_id)
-                elif id_type in ["tvdb", "tmdb_show", "tvdb_season", "tvdb_episode"] and not self.parts_collection:
+                elif id_type in ["tvdb", "tmdb_show", "tvdb_season", "tvdb_episode"]:
+                    tvdb_season = None
                     if id_type == "tmdb_show":
                         try:
                             tvdb_id = self.config.Convert.tmdb_to_tvdb(input_id, fail=True)
@@ -1700,22 +1701,38 @@ class CollectionBuilder:
                             logger.warning(e)
                             continue
                     elif id_type == "tvdb_season":
-                        tvdb_id, _ = input_id.split("_")
+                        tvdb_id, tvdb_season = input_id.split("_")
                         tvdb_id = int(tvdb_id)
+                        tvdb_season = int(tvdb_season)
                     elif id_type == "tvdb_episode":
                         tvdb_id, _, _ = input_id.split("_")
                         tvdb_id = int(tvdb_id)
                     else:
                         tvdb_id = int(input_id)
                     if tvdb_id not in self.ignore_ids:
-                        found = False
+                        found_keys = None
                         for pl_library in self.libraries:
                             if tvdb_id in pl_library.show_map:
-                                found = True
-                                rating_keys = pl_library.show_map[tvdb_id]
+                                found_keys = pl_library.show_map[tvdb_id]
                                 break
-                        if not found and tvdb_id not in self.missing_shows:
+                        if not found_keys and tvdb_id not in self.missing_shows:
                             self.missing_shows.append(tvdb_id)
+                        if found_keys:
+                            if self.parts_collection:
+                                rating_keys = []
+                                for rk in found_keys:
+                                    try:
+                                        item = self.fetch_item(rk)
+                                        if self.builder_level == "episode" and isinstance(item, Show):
+                                            if tvdb_season is not None:
+                                                item = item.season(season=tvdb_season)
+                                            rating_keys.extend([k.ratingKey for k in item.episodes()])
+                                        elif self.builder_level == "season" and isinstance(item, Show):
+                                            rating_keys.extend([k.ratingKey for k in item.seasons()])
+                                    except Failed as e:
+                                        logger.error(e)
+                            else:
+                                rating_keys = found_keys
                 else:
                     continue