diff --git a/frontend/src/components/Applications/ApplicationPlanModal.js b/frontend/src/components/Applications/ApplicationPlanModal.js
index 3a57c2d..343ba95 100644
--- a/frontend/src/components/Applications/ApplicationPlanModal.js
+++ b/frontend/src/components/Applications/ApplicationPlanModal.js
@@ -90,15 +90,78 @@ const ApplicationPlanModal = ({
 
   // Debug logging
   React.useEffect(() => {
-    console.log('ApplicationPlanModal - selectedPropertyDetails:', selectedPropertyDetails);
-    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]);
+    console.log('=== ApplicationPlanModal Debug ===');
+    console.log('selectedPropertyDetails:', selectedPropertyDetails);
+    console.log('mapCenter:', mapCenter);
+    console.log('sections:', selectedPropertyDetails?.sections);
+    
+    console.log('\n=== EQUIPMENT DEBUG ===');
+    console.log('equipment array length:', equipment?.length);
+    console.log('equipment full array:', equipment);
+    if (equipment && equipment.length > 0) {
+      console.log('first equipment item:', equipment[0]);
+      console.log('equipment field analysis:');
+      equipment.forEach((eq, i) => {
+        console.log(`Equipment ${i}:`, {
+          id: eq.id,
+          name: eq.name,
+          equipment_name: eq.equipment_name,
+          custom_name: eq.custom_name,
+          category_name: eq.category_name,
+          type_name: eq.type_name,
+          category: eq.category,
+          type: eq.type,
+          allFields: Object.keys(eq)
+        });
+      });
+    }
+    
+    console.log('\n=== PRODUCTS DEBUG ===');
+    console.log('products array length:', products?.length);
+    console.log('products full array:', products);
+    if (products && products.length > 0) {
+      console.log('first product item:', products[0]);
+      console.log('product field analysis:');
+      products.forEach((prod, i) => {
+        if (i < 3) { // Only show first 3 to avoid spam
+          console.log(`Product ${i}:`, {
+            id: prod.id,
+            name: prod.name,
+            product_name: prod.product_name,
+            productName: prod.productName,
+            brand: prod.brand,
+            product_brand: prod.product_brand,
+            productBrand: prod.productBrand,
+            productType: prod.productType,
+            product_type: prod.product_type,
+            type: prod.type,
+            isShared: prod.isShared,
+            uniqueId: prod.uniqueId,
+            allFields: Object.keys(prod)
+          });
+        }
+      });
+    }
+    
+    console.log('\n=== NOZZLES DEBUG ===');
+    console.log('nozzles array length:', nozzles?.length);
+    console.log('nozzles full array:', nozzles);
+    if (nozzles && nozzles.length > 0) {
+      console.log('first nozzle item:', nozzles[0]);
+      console.log('nozzle field analysis:');
+      nozzles.forEach((nozzle, i) => {
+        console.log(`Nozzle ${i}:`, {
+          id: nozzle.id,
+          name: nozzle.name,
+          custom_name: nozzle.custom_name,
+          manufacturer: nozzle.manufacturer,
+          flow_rate_gpm: nozzle.flow_rate_gpm,
+          orifice_size: nozzle.orifice_size,
+          allFields: Object.keys(nozzle)
+        });
+      });
+    }
+    console.log('=== End Debug ===\n');
   }, [selectedPropertyDetails, mapCenter, equipment, products, nozzles]);
 
   // Handle area selection on map
@@ -330,15 +393,21 @@ const ApplicationPlanModal = ({
                     >
                       <option value="">Select equipment</option>
                       {equipment
-                        .filter(eq => !applicationType || 
-                          (applicationType === 'granular' && eq.category_name === 'Spreader') ||
-                          (applicationType === 'liquid' && eq.category_name === 'Sprayer')
-                        )
+                        .filter(eq => {
+                          if (!applicationType) return true;
+                          // Filter by application type - granular needs Spreader, liquid needs Sprayer
+                          if (applicationType === 'granular') {
+                            return eq.category_name === 'Spreader';
+                          } else if (applicationType === 'liquid') {
+                            return eq.category_name === 'Sprayer';
+                          }
+                          return true;
+                        })
                         .map(eq => (
-                          <option key={eq.id} value={eq.id}>
-                            {eq.custom_name} ({eq.type_name})
-                          </option>
-                        ))}
+                        <option key={eq.id} value={eq.id}>
+                          {eq.custom_name} - {eq.type_name}
+                        </option>
+                      ))}
                     </select>
                   </div>
 
@@ -434,8 +503,8 @@ const ApplicationPlanModal = ({
                           .map(prod => (
                             <option key={prod.uniqueId || prod.id} value={prod.uniqueId || prod.id}>
                               {prod.name || prod.product_name || prod.productName || 'Unknown Product'}
-                              {(prod.brand || prod.product_brand || prod.productBrand) && ` - ${prod.brand || prod.product_brand || prod.productBrand}`}
-                              {prod.isShared === false && ' (Custom)'}
+                              {(prod.brand || prod.product_brand || prod.productBrand) && ` (${prod.brand || prod.product_brand || prod.productBrand})`}
+                              {prod.isShared === false && ' - Custom'}
                             </option>
                           ))}
                       </select>