diff --git a/src/app/(main)/settings/SettingsLayout.tsx b/src/app/(main)/settings/SettingsLayout.tsx
index b3cf7df0e..08f5a34c2 100644
--- a/src/app/(main)/settings/SettingsLayout.tsx
+++ b/src/app/(main)/settings/SettingsLayout.tsx
@@ -55,7 +55,9 @@ export function SettingsLayout({ children }: { children: ReactNode }) {
           allowMinimize={false}
         />
       </Column>
-      <PageBody gap="6">{children}</PageBody>
+      <Column gap="6" margin="2">
+        <PageBody>{children}</PageBody>
+      </Column>
     </Grid>
   );
 }
diff --git a/src/lib/request.ts b/src/lib/request.ts
index e4ecb8849..fc07ab8c4 100644
--- a/src/lib/request.ts
+++ b/src/lib/request.ts
@@ -100,25 +100,33 @@ export async function getQueryFilters(
     await setWebsiteDate(websiteId, dateRange);
 
     if (params.segment) {
-      Object.assign(filters, (await getWebsiteSegment(websiteId, params.segment))?.parameters);
+      const segmentParams = (await getWebsiteSegment(websiteId, params.segment))
+        ?.parameters as Record<string, any>;
+
+      Object.assign(filters, segmentParams.filters);
     }
 
     if (params.cohort) {
-      const cohortFilters = (await getWebsiteSegment(websiteId, params.cohort))
+      const cohortParams = (await getWebsiteSegment(websiteId, params.cohort))
         ?.parameters as Record<string, any>;
 
       // convert dateRange to startDate and endDate
-      if (cohortFilters.dateRange) {
-        const { startDate, endDate } = parseDateRange(cohortFilters.dateRange);
-        cohortFilters.startDate = startDate;
-        cohortFilters.endDate = endDate;
-        delete cohortFilters.dateRange;
+      if (cohortParams.dateRange) {
+        const { startDate, endDate } = parseDateRange(cohortParams.dateRange);
+        cohortParams.startDate = startDate;
+        cohortParams.endDate = endDate;
+        delete cohortParams.dateRange;
+      }
+
+      if (cohortParams.filters) {
+        Object.assign(cohortParams, cohortParams.filters);
+        delete cohortParams.filters;
       }
 
       Object.assign(
         filters,
         Object.fromEntries(
-          Object.entries(cohortFilters || {}).map(([key, value]) =>
+          Object.entries(cohortParams || {}).map(([key, value]) =>
             key === 'startDate' || key === 'endDate'
               ? [`cohort_${key}`, new Date(value)]
               : [`cohort_${key}`, value],