diff --git a/src/main/java/com/dgs/v1/controller/ForecastController.java b/src/main/java/com/dgs/v1/controller/ForecastController.java
index 3803d3a..16d0bc6 100644
--- a/src/main/java/com/dgs/v1/controller/ForecastController.java
+++ b/src/main/java/com/dgs/v1/controller/ForecastController.java
@@ -96,6 +96,11 @@ public CompletableFuture<Object> getProductBySelectedThread(
         } else if (ctx.getCategory() != null) {
             products = productService.getByColumn(ctx, "sclassno", ctx.getCategory(), limit);
         }
+        else if (ctx.getSelectedSuppliers() != null) {
+            products = supplierService.getBySelected(ctx, ctx.getSelectedSuppliers(), limit);
+        } else if (ctx.getSelectedCategories() != null) {
+            products = categoryService.getBySelected(ctx, ctx.getSelectedCategories(), limit);
+        }
         LOGGER.info(String.format("Fetched %s Products ", products.size()));
 
         ThreadPoolTaskExecutor executorTask;
@@ -162,6 +167,11 @@ public HashMap<String, Object> getExcelThread(
         } else if (ctx.getCategory() != null) {
             products = productService.getByColumn(ctx, "sclassno", ctx.getCategory(), limit);
         }
+        else if (ctx.getSelectedSuppliers() != null) {
+            products = supplierService.getBySelected(ctx, ctx.getSelectedSuppliers(), limit);
+        } else if (ctx.getSelectedCategories() != null) {
+            products = categoryService.getBySelected(ctx, ctx.getSelectedCategories(), limit);
+        }
 
         //populate Excel with config value ex. lead time, order frequency
         ctx.populateExcelTitle();
@@ -305,6 +315,11 @@ public List<ResponseBody> getProductBySelected(
         if (ctx.getToProduct() != null && ctx.getFromProduct() != null) {
             products = productService.getByRange(ctx, ctx.getFromProduct(), ctx.getToProduct(), limit);
         }
+        else if (ctx.getSelectedSuppliers() != null) {
+            products = supplierService.getBySelected(ctx, ctx.getSelectedSuppliers(), limit);
+        } else if (ctx.getSelectedCategories() != null) {
+            products = categoryService.getBySelected(ctx, ctx.getSelectedCategories(), limit);
+        }
         LOGGER.info("Fetched products");
         products.forEach(p -> {
             responseBody.add(responseBodyService.getResponseBodyForProduct(ctx, p));