src/app/(main)/settings/SettingsLayout.tsx

@@ -55,9 +55,7 @@ export function SettingsLayout({ children }: { children: ReactNode }) {
           allowMinimize={false}
         />
       </Column>
-      <Column gap="6" margin="2">
-        <PageBody>{children}</PageBody>
-      </Column>
+      <PageBody gap="6">{children}</PageBody>
     </Grid>
   );
 }

src/lib/request.ts

@@ -100,33 +100,25 @@ export async function getQueryFilters(
     await setWebsiteDate(websiteId, dateRange);
 
     if (params.segment) {
-      const segmentParams = (await getWebsiteSegment(websiteId, params.segment))
-        ?.parameters as Record<string, any>;
-
-      Object.assign(filters, segmentParams.filters);
+      Object.assign(filters, (await getWebsiteSegment(websiteId, params.segment))?.parameters);
     }
 
     if (params.cohort) {
-      const cohortParams = (await getWebsiteSegment(websiteId, params.cohort))
+      const cohortFilters = (await getWebsiteSegment(websiteId, params.cohort))
         ?.parameters as Record<string, any>;
 
       // convert dateRange to startDate and endDate
-      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;
+      if (cohortFilters.dateRange) {
+        const { startDate, endDate } = parseDateRange(cohortFilters.dateRange);
+        cohortFilters.startDate = startDate;
+        cohortFilters.endDate = endDate;
+        delete cohortFilters.dateRange;
       }
 
       Object.assign(
         filters,
         Object.fromEntries(
-          Object.entries(cohortParams || {}).map(([key, value]) =>
+          Object.entries(cohortFilters || {}).map(([key, value]) =>
             key === 'startDate' || key === 'endDate'
               ? [`cohort_${key}`, new Date(value)]
               : [`cohort_${key}`, value],