diff --git a/frontend/src/components/Applications/ApplicationPlanModal.js b/frontend/src/components/Applications/ApplicationPlanModal.js
index 0c2ff1f..e13902a 100644
--- a/frontend/src/components/Applications/ApplicationPlanModal.js
+++ b/frontend/src/components/Applications/ApplicationPlanModal.js
@@ -94,8 +94,11 @@ const ApplicationPlanModal = ({
     console.log('ApplicationPlanModal - mapCenter:', mapCenter);
     console.log('ApplicationPlanModal - sections:', selectedPropertyDetails?.sections);
     console.log('ApplicationPlanModal - equipment:', equipment);
+    console.log('ApplicationPlanModal - equipment sample:', equipment[0]);
     console.log('ApplicationPlanModal - products:', products);
+    console.log('ApplicationPlanModal - products sample:', products[0]);
     console.log('ApplicationPlanModal - nozzles:', nozzles);
+    console.log('ApplicationPlanModal - nozzles sample:', nozzles[0]);
   }, [selectedPropertyDetails, mapCenter, equipment, products, nozzles]);
 
   // Handle area selection on map
@@ -326,18 +329,13 @@ const ApplicationPlanModal = ({
                       required
                     >
                       <option value="">Select equipment</option>
-                      {equipment
-                        .filter(eq => !applicationType || 
-                          (applicationType === 'granular' && (eq.equipment_type === 'spreader' || eq.type === 'spreader')) ||
-                          (applicationType === 'liquid' && (eq.equipment_type === 'sprayer' || eq.type === 'sprayer'))
-                        )
-                        .map(eq => (
-                          <option key={eq.id} value={eq.id}>
-                            {eq.equipment_name || eq.name || eq.manufacturer || 'Unnamed Equipment'} 
-                            {eq.equipment_type || eq.type ? ` (${eq.equipment_type || eq.type})` : ''}
-                            {eq.equipment_model || eq.model ? ` - ${eq.equipment_model || eq.model}` : ''}
-                          </option>
-                        ))}
+                      {equipment.map(eq => (
+                        <option key={eq.id} value={eq.id}>
+                          {eq.equipment_name || eq.name || eq.manufacturer || 'Unnamed Equipment'} 
+                          {eq.equipment_type || eq.type ? ` (${eq.equipment_type || eq.type})` : ''}
+                          {eq.equipment_model || eq.model ? ` - ${eq.equipment_model || eq.model}` : ''}
+                        </option>
+                      ))}
                     </select>
                   </div>
 
@@ -425,13 +423,16 @@ const ApplicationPlanModal = ({
                       >
                         <option value="">Select product</option>
                         {products
-                          .filter(prod => !applicationType || prod.productType === applicationType || prod.product_type === applicationType)
+                          .filter(prod => !applicationType || 
+                            (prod.productType === applicationType) || 
+                            (prod.product_type === applicationType) ||
+                            (prod.type === applicationType)
+                          )
                           .map(prod => (
                             <option key={prod.uniqueId} value={prod.uniqueId}>
-                              {prod.product_name || prod.name} 
-                              {(prod.product_brand || prod.brand) && ` (${prod.product_brand || prod.brand})`}
-                              {prod.isShared ? '' : ' (Custom)'}
-                              {prod.activeIngredient && ` - ${prod.activeIngredient}`}
+                              {prod.product_name || prod.name || prod.productName || 'Unknown Product'}
+                              {(prod.product_brand || prod.brand || prod.productBrand) && ` - ${prod.product_brand || prod.brand || prod.productBrand}`}
+                              {prod.isShared === false && ' (Custom)'}
                             </option>
                           ))}
                       </select>