diff --git a/cpt-kuesel/metadata/admin/_templates.yml b/cpt-kuesel/metadata/admin/_templates.yml
index 02761a6..3278f65 100644
--- a/cpt-kuesel/metadata/admin/_templates.yml
+++ b/cpt-kuesel/metadata/admin/_templates.yml
@@ -1,47 +1,65 @@
 templates:
   ol_builder:
+    ignore_blank_results: true
     optional:
       - overlay_level
     collection_level: <<overlay_level>>
+    conditionals:
+      ol_folder:
+        default: _posters
+        conditions:
+          - overlay_level: episode
+            value: _titlecards
     overlay:
-      name: <<ol_type>>_<<ol_overlay>>_<<ol_queue>>_<<ol_weight>>
+      name: <<ol_overlay>>_<<ol_queue>>_<<ol_weight>>
       file: overlays/<<ol_folder>>/<<ol_file>>.png
       queue: <<ol_queue>>
       weight: <<ol_weight>>
   it_items:
+    ignore_blank_results: true
     optional:
       - it_language
       - it_uhd
       - it_hdr
-      - it_queue
-    default:
-      it_default: "bottom, up_corners, down_corners, left_side, right_side, sides" # list of comma separated labels used to change overlay positions, call as null when using one of those labels with it_queue
+      - it_pos
+    conditionals:
+      it_pos_filter: # labels used to change overlay positions
+        default: "Bottom, Up_corners, Down_corners, Left_side, Right_side, Sides"
+        conditions:
+          - it_pos: Bottom
+            value: "Up_corners, Down_corners, Left_side, Right_side, Sides"
+          - it_pos: Up_corners
+            value: "Bottom, Down_corners, Left_side, Right_side, Sides"
+          - it_pos: Down_corners
+            value: "Bottom, Up_corners, Left_side, Right_side, Sides"
+          - it_pos: Left_side
+            value: "Bottom, Up_corners, Down_corners, Right_side, Sides"
+          - it_pos: Right_side
+            value: "Bottom, Up_corners, Down_corners, Left_side, Sides"
+          - it_pos: Sides
+            value: "Bottom, Up_corners, Down_corners, Left_side, Right_side"
     plex_search:
       all:
         audio_language: <<it_language>>
         resolution: <<it_uhd>>
         hdr: <<it_hdr>>
-        label: <<it_queue>>
-        label.not: <<it_default>>
+        label: <<it_pos>>
+        label.not: <<it_pos_filter>>
   lbxd_list:
+    ignore_blank_results: true
     optional:
       - lbxd_order
       - lbxd_smart
     default:
       lbxd_user: cpt_kuesel
       lbxd_sort: <<collection_name>>
-    letterboxd_list: https://letterboxd.com/<<lbxd_user>>/list/<<lbxd_list>>/
-    collection_order: <<lbxd_order>>
-    smart_label: <<lbxd_smart>>
-    sort_title: <<lbxd_sort>>
-  lbxd_wlist:
-    optional:
-      - lbxd_order
-      - lbxd_smart
-    default:
-      lbxd_user: cpt_kuesel
-      lbxd_sort: <<collection_name>>
-    letterboxd_list: https://letterboxd.com/<<lbxd_user>>/watchlist/
+    conditionals:
+      lboxd_url:
+        default: https://letterboxd.com/<<lbxd_user>>/list/<<lbxd_list>>/
+        conditions:
+          - lboxd_list: watchlist
+            value: https://letterboxd.com/<<lbxd_user>>/<<lbxd_list>>/
+    letterboxd_list: <<lbxd_url>>
     collection_order: <<lbxd_order>>
     smart_label: <<lbxd_smart>>
     sort_title: <<lbxd_sort>>
diff --git a/cpt-kuesel/metadata/admin/core.yml b/cpt-kuesel/metadata/admin/core.yml
index 15a56f8..a609e8f 100644
--- a/cpt-kuesel/metadata/admin/core.yml
+++ b/cpt-kuesel/metadata/admin/core.yml
@@ -6,14 +6,17 @@ templates:
       label_collector: true
     allowed_library_types: <<label_collector>>
   german_metadata:
+    ignore_blank_results: true
     default:
       german_metadata: true
     allowed_library_types: <<german_metadata>>
   non_german_metadata:
+    ignore_blank_results: true
     default:
       non_german_metadata: true
     allowed_library_types: <<non_german_metadata>>
   local_only:
+    ignore_blank_results: true
     default:
       local_only: false
     allowed_library_types: <<local_only>>
@@ -38,7 +41,7 @@ collections:
     plex_search:
       all:
         audio_language: de
-        label: non_german_metadata
+        label: Non_german_metadata
     item_label.remove: Non_german_metadata
   remove_german_metadata:
     template: {name: german_metadata}
@@ -46,7 +49,7 @@ collections:
     plex_search:
       all:
         audio_language.not: de
-        label: german_metadata
+        label: German_metadata
     item_label.remove: German_metadata
   german_metadata:
     template: {name: german_metadata}
@@ -54,28 +57,24 @@ collections:
     plex_search:
       all:
         audio_language: de
-        label.not: german_metadata
+        label.not: German_metadata
     item_metadata_language: de-DE
     item_label: German_metadata
-    item_label.remove: Non_german_metadata
   non_german_metadata:
     template: {name: non_german_metadata}
     build_collection: false
     plex_search:
       all:
         audio_language.not: de
-        label.not: non_german_metadata
+        label.not: Non_german_metadata
     item_metadata_language: en-US
     item_label: Non_german_metadata
-    item_label.remove: German_metadata
   local_only:
     template:
       - name: local_only
-      - name: it_items
-        it_default: local_only
-        it_resolution: 4k
-      - name: it_items
-        it_default: local_only
-        it_hdr: true
+    plex_search:
+      any:
+        - resolution: 4k
+        - hdr: true
     build_collection: false
     item_label: Local_only