diff --git a/packages/example-themes/fasttify/theme/sections/featured-products.liquid b/packages/example-themes/fasttify/theme/sections/featured-products.liquid
index 262b3060..0404ba61 100644
--- a/packages/example-themes/fasttify/theme/sections/featured-products.liquid
+++ b/packages/example-themes/fasttify/theme/sections/featured-products.liquid
@@ -4,7 +4,7 @@
 <section class="featured-products-section">
   <div class="featured-products-container">
     <!-- Obtener la colección -->
-    {% assign featured_collection = collections['nuevos-productos'] %}
+    {% assign featured_collection = collections['new-products'] %}
 
     <!-- Header de la sección -->
     <div class="section-header">
diff --git a/packages/example-themes/fasttify/theme/snippets/header.liquid b/packages/example-themes/fasttify/theme/snippets/header.liquid
index 23b8c8f4..ff97eead 100644
--- a/packages/example-themes/fasttify/theme/snippets/header.liquid
+++ b/packages/example-themes/fasttify/theme/snippets/header.liquid
@@ -56,7 +56,7 @@
                 {% if link.title == 'Todos los Productos' %}
                 <div class="container">
                   <div class="dropdown-products-grid">
-                    {% assign featured_collection = collections['nuevos-productos'] %}
+                    {% assign featured_collection = collections['new-products'] %}
                     {% for product in featured_collection.products limit: 4 %}
                     <div class="product-card">
                       <div class="product-image-wrapper">
diff --git a/packages/liquid-forge/services/templates/parsing/liquid-syntax-detector.ts b/packages/liquid-forge/services/templates/parsing/liquid-syntax-detector.ts
index 529afaf7..08c8cd62 100644
--- a/packages/liquid-forge/services/templates/parsing/liquid-syntax-detector.ts
+++ b/packages/liquid-forge/services/templates/parsing/liquid-syntax-detector.ts
@@ -74,22 +74,18 @@ const loadOptionsExtractors: Record<DataRequirement, (content: string) => DataLo
   specific_collection: (content: string) => {
     const handles: string[] = [];
 
-    const bracketMatches = content.match(LIQUID_COLLECTION_ACCESS_PATTERNS.bracketNotation);
-    if (bracketMatches) {
-      bracketMatches.forEach((match) => {
-        const handleMatch = match.match(LIQUID_COLLECTION_ACCESS_PATTERNS.bracketNotation);
-        if (handleMatch) handles.push(handleMatch[1]);
-      });
+    const bracketMatches = content.matchAll(LIQUID_COLLECTION_ACCESS_PATTERNS.bracketNotation);
+    for (const match of bracketMatches) {
+      if (match[1] && !handles.includes(match[1])) {
+        handles.push(match[1]);
+      }
     }
 
-    const dotMatches = content.match(LIQUID_COLLECTION_ACCESS_PATTERNS.dotNotation);
-    if (dotMatches) {
-      dotMatches.forEach((match) => {
-        const handleMatch = match.match(LIQUID_COLLECTION_ACCESS_PATTERNS.extractCollectionHandle);
-        if (handleMatch && !handles.includes(handleMatch[1])) {
-          handles.push(handleMatch[1]);
-        }
-      });
+    const dotMatches = content.matchAll(LIQUID_COLLECTION_ACCESS_PATTERNS.dotNotation);
+    for (const match of dotMatches) {
+      if (match[1] && !handles.includes(match[1])) {
+        handles.push(match[1]);
+      }
     }
 
     return { handles };
@@ -98,12 +94,11 @@ const loadOptionsExtractors: Record<DataRequirement, (content: string) => DataLo
   specific_product: (content: string) => {
     const handles: string[] = [];
 
-    const bracketMatches = content.match(LIQUID_COLLECTION_ACCESS_PATTERNS.specificProduct);
-    if (bracketMatches) {
-      bracketMatches.forEach((match) => {
-        const handleMatch = match.match(LIQUID_COLLECTION_ACCESS_PATTERNS.specificProduct);
-        if (handleMatch) handles.push(handleMatch[1]);
-      });
+    const bracketMatches = content.matchAll(LIQUID_COLLECTION_ACCESS_PATTERNS.specificProduct);
+    for (const match of bracketMatches) {
+      if (match[1] && !handles.includes(match[1])) {
+        handles.push(match[1]);
+      }
     }
 
     return { handles };
@@ -114,14 +109,11 @@ const loadOptionsExtractors: Record<DataRequirement, (content: string) => DataLo
     const limitMatch = content.match(LIQUID_FILTER_PATTERNS.generalLimit);
     const limit = limitMatch ? parseInt(limitMatch[1], 10) : 8;
 
-    const collectionRefs = content.match(LIQUID_COLLECTION_ACCESS_PATTERNS.collectionProducts);
-    if (collectionRefs) {
-      collectionRefs.forEach((ref) => {
-        const handleMatch = ref.match(LIQUID_COLLECTION_ACCESS_PATTERNS.extractCollectionHandle);
-        if (handleMatch && !handles.includes(handleMatch[1])) {
-          handles.push(handleMatch[1]);
-        }
-      });
+    const collectionRefs = content.matchAll(LIQUID_COLLECTION_ACCESS_PATTERNS.collectionProducts);
+    for (const match of collectionRefs) {
+      if (match[1] && !handles.includes(match[1])) {
+        handles.push(match[1]);
+      }
     }
 
     return { handles, limit };
@@ -137,22 +129,18 @@ const loadOptionsExtractors: Record<DataRequirement, (content: string) => DataLo
   specific_page: (content: string) => {
     const handles: string[] = [];
 
-    const bracketMatches = content.match(LIQUID_COLLECTION_ACCESS_PATTERNS.extractPagesBracket);
-    if (bracketMatches) {
-      bracketMatches.forEach((match) => {
-        const handleMatch = match.match(LIQUID_COLLECTION_ACCESS_PATTERNS.pagesBracketExtract);
-        if (handleMatch) handles.push(handleMatch[1]);
-      });
+    const bracketMatches = content.matchAll(LIQUID_COLLECTION_ACCESS_PATTERNS.extractPagesBracket);
+    for (const match of bracketMatches) {
+      if (match[1] && !handles.includes(match[1])) {
+        handles.push(match[1]);
+      }
     }
 
-    const dotMatches = content.match(LIQUID_COLLECTION_ACCESS_PATTERNS.extractPagesDot);
-    if (dotMatches) {
-      dotMatches.forEach((match) => {
-        const handleMatch = match.match(LIQUID_COLLECTION_ACCESS_PATTERNS.extractPagesHandle);
-        if (handleMatch && !handles.includes(handleMatch[1])) {
-          handles.push(handleMatch[1]);
-        }
-      });
+    const dotMatches = content.matchAll(LIQUID_COLLECTION_ACCESS_PATTERNS.extractPagesDot);
+    for (const match of dotMatches) {
+      if (match[1] && !handles.includes(match[1])) {
+        handles.push(match[1]);
+      }
     }
 
     return { handles };
@@ -178,22 +166,18 @@ const loadOptionsExtractors: Record<DataRequirement, (content: string) => DataLo
   page: (content: string) => {
     const handles: string[] = [];
 
-    const bracketMatches = content.match(LIQUID_COLLECTION_ACCESS_PATTERNS.extractPagesBracket);
-    if (bracketMatches) {
-      bracketMatches.forEach((match) => {
-        const handleMatch = match.match(LIQUID_COLLECTION_ACCESS_PATTERNS.pagesBracketExtract);
-        if (handleMatch) handles.push(handleMatch[1]);
-      });
+    const bracketMatches = content.matchAll(LIQUID_COLLECTION_ACCESS_PATTERNS.extractPagesBracket);
+    for (const match of bracketMatches) {
+      if (match[1] && !handles.includes(match[1])) {
+        handles.push(match[1]);
+      }
     }
 
-    const dotMatches = content.match(LIQUID_COLLECTION_ACCESS_PATTERNS.extractPagesDot);
-    if (dotMatches) {
-      dotMatches.forEach((match) => {
-        const handleMatch = match.match(LIQUID_COLLECTION_ACCESS_PATTERNS.extractPagesHandle);
-        if (handleMatch && !handles.includes(handleMatch[1])) {
-          handles.push(handleMatch[1]);
-        }
-      });
+    const dotMatches = content.matchAll(LIQUID_COLLECTION_ACCESS_PATTERNS.extractPagesDot);
+    for (const match of dotMatches) {
+      if (match[1] && !handles.includes(match[1])) {
+        handles.push(match[1]);
+      }
     }
 
     return handles.length > 0 ? { handles } : {};