diff --git a/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java b/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java
index f846580..5954ee1 100644
--- a/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java
+++ b/litmus-core/src/main/java/com/navi/medici/service/experiment/ExperimentServiceImpl.java
@@ -111,7 +111,7 @@ public class ExperimentServiceImpl implements ExperimentService {
                 .strategies(jacksonUtils.objectToString(strategies))
                 .variants(jacksonUtils.objectToString(variants))
                 .type(ExperimentType.EXPERIMENT)
-                .vertical(request.getVertical())
+                .vertical(team.map(TeamEntity::getTeamName).orElse(null))
                 .createdBy(emailId)
                 .build();
         Optional<MetricEntity> primaryMetric = metricQuery.findByMetricName(request.getPrimaryMetric());
@@ -261,7 +261,19 @@ public class ExperimentServiceImpl implements ExperimentService {
             throw new LitmusExperimentNotFoundException(String.format("experiment %s not found in system",
                     litmusExperimentStrategyUpdate.getExperimentId()));
         }
-
+        litmusExperimentStrategyUpdate.getStrategies().forEach(
+                strategy -> {
+                    Map<String, String> parameters = new HashMap<>(strategy.getParameters());
+                    if (StringUtils.isBlank(strategy.getParameters().get("groupId"))) {
+                        if (strategy.getName().equals("flexibleRollout")) {
+                            parameters.put("groupId", experimentExist.get().getName() + "-group-id");
+                        } else {
+                            parameters.put("groupId", strategy.getParameters().get("segment") + "-group-id");
+                        }
+                    }
+                    strategy.setParameters(parameters);
+                }
+        );
         log.info("updating strategies. experiment: {}, new_strategies: {}, old_strategies:{}",
                 experimentExist.get().getName(),
                 jacksonUtils.objectToString(litmusExperimentStrategyUpdate.getStrategies()),
diff --git a/litmus-liquibase/src/main/resources/db/changelog/202304111312-add-index-on-enabled.sql b/litmus-liquibase/src/main/resources/db/changelog/202304111312-add-index-on-enabled.sql
new file mode 100644
index 0000000..932f609
--- /dev/null
+++ b/litmus-liquibase/src/main/resources/db/changelog/202304111312-add-index-on-enabled.sql
@@ -0,0 +1,4 @@
+--liquibase formatted sql
+
+--changeset author:akshatsoni id:202304111312
+CREATE INDEX idx_enabled on experiments (enabled);
\ No newline at end of file