diff --git a/gsrs-module-products-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/products/product/indexers/ProductSubstanceIndexValueMaker.java b/gsrs-module-products-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/products/product/indexers/ProductSubstanceIndexValueMaker.java
index 113a333..c469349 100644
--- a/gsrs-module-products-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/products/product/indexers/ProductSubstanceIndexValueMaker.java
+++ b/gsrs-module-products-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/products/product/indexers/ProductSubstanceIndexValueMaker.java
@@ -63,6 +63,7 @@ public void createIndexableValues(Product product, Consumer<IndexableValue> cons
 
                                 // Get from Config which Substance Key Resolver to use. Substance API or Entity Mananger
                                 if (substanceKeyResolverToUseFromConfig != null) {
+
                                     if (substanceKeyResolverToUseFromConfig.equalsIgnoreCase("api")) {
                                         // Call SUBSTANCE API Substance Resolver
                                         createIndexableValuesBySubstanceApiResolver(consumer, substanceKey, substanceKeyType);
@@ -75,6 +76,16 @@ public void createIndexableValues(Product product, Consumer<IndexableValue> cons
                             }  // product substance key not null
                         } // product Ingredient is not null
                     }  // for productIngredients
+
+                    // Number of Ingredients in the Product
+                    if (prodLot.productIngredients != null) {
+                        String ingredientSize = "0";
+                        if (prodLot.productIngredients.size() > 0) {
+                            ingredientSize = Integer.toString(prodLot.productIngredients.size());
+                        }
+                        consumer.accept(IndexableValue.simpleFacetStringValue("Number of Ingredients", ingredientSize));
+                    }
+
                 } // for productLots
             } // for productManufactureItems
 
diff --git a/gsrs-module-products-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/products/product/models/Product.java b/gsrs-module-products-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/products/product/models/Product.java
index a851d33..059f70e 100644
--- a/gsrs-module-products-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/products/product/models/Product.java
+++ b/gsrs-module-products-spring-boot-autoconfigure/src/main/java/gov/hhs/gsrs/products/product/models/Product.java
@@ -38,8 +38,11 @@ public class Product extends ProductCommonData {
     @Column(name="PRODUCT_ID")
     public Long id;
 
-    @Column(name="PHARMACEUTICAL_DOSAGE_FORM", length=500)
-    public String pharmaceuticalDosageForm;
+    @Column(name="PRODUCT_CONTAINER", length=500)
+    public String productContainer;
+
+    @Column(name="PHARMACEDICAL_DOSAGE_FORM", length=500)
+    public String pharmacedicalDosageForm;
 
     @Indexable(suggest = true, facet=true, name="Route of Administration")
     @Column(name="ROUTE_OF_ADMINISTRATION")