diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/StopAreaDetailsPage.tsx b/ui/src/components/stop-registry/stop-areas/stop-area-details/StopAreaDetailsPage.tsx
index 5313723e6..28b0b64a7 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/StopAreaDetailsPage.tsx
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/StopAreaDetailsPage.tsx
@@ -1,6 +1,6 @@
 import { FC, useEffect, useState } from 'react';
-import { Navigate, useParams } from 'react-router-dom';
-import { useLoader } from '../../../../hooks';
+import { Navigate } from 'react-router-dom';
+import { useGetStopPlaceDetails, useLoader } from '../../../../hooks';
 import { Container } from '../../../../layoutComponents';
 import { LoadingState, Operation } from '../../../../redux';
 import {
@@ -10,22 +10,20 @@ import {
   StopAreaVersioningRow,
 } from './components';
 import { StopAreaEditableBlock } from './StopAreaEditableBlock';
-import { useGetStopAreaDetails } from './useGetStopAreaDetails';
 
 const testIds = {
   page: 'StopAreaDetailsPage::page',
 };
 
 export const StopAreaDetailsPage: FC<Record<string, never>> = () => {
-  const { id } = useParams();
 
   const [blockInEdit, setBlockInEdit] = useState<StopAreaEditableBlock | null>(
     null,
   );
 
-  const { area, loading, refetch } = useGetStopAreaDetails(id ?? '');
+  const { stopPlaceDetails, loading, refetch } = useGetStopPlaceDetails();
   const { setLoadingState } = useLoader(Operation.FetchStopAreaPageDetails, {
-    initialState: area ? LoadingState.NotLoading : LoadingState.MediumPriority,
+    initialState: stopPlaceDetails ? LoadingState.NotLoading : LoadingState.MediumPriority,
   });
 
   useEffect(() => {
@@ -34,27 +32,27 @@ export const StopAreaDetailsPage: FC<Record<string, never>> = () => {
     }
   }, [loading, setLoadingState]);
 
-  if (loading && !area) {
+  if (loading && !stopPlaceDetails) {
     return null;
   }
 
-  if (!area) {
+  if (!stopPlaceDetails) {
     return <Navigate to="/404" replace />;
   }
 
   return (
     <Container className="space-y-4" testId={testIds.page}>
-      <StopAreaTitleRow area={area} />
+      <StopAreaTitleRow area={stopPlaceDetails} />
       <hr />
-      <StopAreaVersioningRow area={area} />
+      <StopAreaVersioningRow area={stopPlaceDetails} />
       <StopAreaDetailsAndMap
-        area={area}
+        area={stopPlaceDetails}
         blockInEdit={blockInEdit}
         onEditBlock={setBlockInEdit}
         refetch={refetch}
       />
       <StopAreaMemberStops
-        area={area}
+        area={stopPlaceDetails}
         blockInEdit={blockInEdit}
         onEditBlock={setBlockInEdit}
         refetch={refetch}
diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaComponentProps.ts b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaComponentProps.ts
index 6ec3e742c..4971a2323 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaComponentProps.ts
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaComponentProps.ts
@@ -1,14 +1,14 @@
 import { Dispatch, SetStateAction } from 'react';
-import { StopAreaDetailsFragment } from '../../../../../generated/graphql';
 import { StopAreaEditableBlock } from '../StopAreaEditableBlock';
+import { StopPlaceWithDetails } from '../../../../../hooks';
 
 export type StopAreaComponentProps = {
-  readonly area: StopAreaDetailsFragment;
+  readonly area: StopPlaceWithDetails;
   readonly className?: string;
 };
 
 export type EditableStopAreaComponentProps = {
-  readonly area: StopAreaDetailsFragment;
+  readonly area: StopPlaceWithDetails;
   readonly className?: string;
   readonly blockInEdit: StopAreaEditableBlock | null;
   readonly onEditBlock: Dispatch<SetStateAction<StopAreaEditableBlock | null>>;
diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaDetailsEdit.tsx b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaDetailsEdit.tsx
index f3b54fefa..31a1825be 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaDetailsEdit.tsx
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaDetailsEdit.tsx
@@ -3,8 +3,8 @@ import React, { ForwardRefRenderFunction, forwardRef, useMemo } from 'react';
 import { FormProvider, UseFormReturn, useForm } from 'react-hook-form';
 import { useTranslation } from 'react-i18next';
 import { twMerge } from 'tailwind-merge';
-import { StopAreaDetailsFragment } from '../../../../../generated/graphql';
-import { useLoader } from '../../../../../hooks';
+import { StopAreaDetailsFragment, StopPlaceDetailsFragment } from '../../../../../generated/graphql';
+import { StopPlaceWithDetails, useLoader } from '../../../../../hooks';
 import { Column } from '../../../../../layoutComponents';
 import { Operation } from '../../../../../redux';
 import { mapToISODate } from '../../../../../time';
@@ -21,7 +21,6 @@ import {
   StopAreaFormState,
   TypedName,
   stopAreaFormSchema,
-  stopAreaMemberStopSchema,
   useUpsertStopArea,
 } from '../../../../forms/stop-area';
 
@@ -33,26 +32,22 @@ const testIds = {
 };
 
 export const mapStopAreaDataToFormState = (
-  area: StopAreaDetailsFragment,
+  area: StopPlaceWithDetails,
 ): Partial<FormState> => {
-  const { latitude, longitude } = mapLngLatToPoint(
-    area.geometry?.coordinates ?? [],
+  /*const { latitude, longitude } = mapLngLatToPoint(
+    area.stop_place?.geometry?.coordinates ?? [],
   );
 
-  const mappedMembers = area.members
-    ?.map((rawMember) => stopAreaMemberStopSchema.safeParse(rawMember))
-    .filter((parseResult) => parseResult.success)
-    .map((parseResult) => parseResult.data);
+  console.log('AREA', latitude)*/
 
   return {
-    label: area.name?.value ?? undefined,
-    name: area.description?.value ?? undefined,
-    latitude,
-    longitude,
-    memberStops: mappedMembers ?? [],
-    validityStart: mapToISODate(area.validBetween?.fromDate),
-    validityEnd: mapToISODate(area.validBetween?.toDate),
-    indefinite: !area.validBetween?.toDate,
+    label: area.stop_place?.name?.value ?? undefined,
+    name: area.stop_place?.name ?? undefined,
+    /*latitude,
+    longitude,*/
+    validityStart: mapToISODate(area.stop_place?.validityStart),
+    validityEnd: mapToISODate(area.stop_place?.validityEnd),
+    indefinite: !area.stop_place?.validityEnd,
   };
 };
 
@@ -71,7 +66,7 @@ function getOverriddenNames(
 }
 
 type StopAreaDetailsEditProps = {
-  readonly area: StopAreaDetailsFragment;
+  readonly area: StopPlaceWithDetails;
   readonly className?: string;
   readonly refetch: () => Promise<unknown>;
   readonly onFinishEditing: () => void;
@@ -88,7 +83,7 @@ const StopAreaDetailsEditImpl: ForwardRefRenderFunction<
   const onSubmit = async (state: StopAreaFormState) => {
     setIsLoading(true);
     try {
-      await upsertStopArea({ id: area.id, state });
+      await upsertStopArea({ id: area.stop_place?.id, state });
       await refetch();
 
       showSuccessToast(t('stopArea.editSuccess'));
@@ -160,7 +155,7 @@ const StopAreaDetailsEditImpl: ForwardRefRenderFunction<
           </FormRow>
 
           <NameConsistencyChecker.NameOnlyForm
-            stopAreaId={area.id as string}
+            stopAreaId={area.stop_place?.id as string}
             stopAreaNameOverrides={overriddenNames}
           />
         </FormColumn>
diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaDetailsView.tsx b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaDetailsView.tsx
index 25e316778..9b84ca17c 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaDetailsView.tsx
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaDetailsView.tsx
@@ -1,22 +1,24 @@
 import { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { twMerge } from 'tailwind-merge';
-import { StopAreaDetailsFragment } from '../../../../../generated/graphql';
 import { mapToShortDate } from '../../../../../time';
 import { DetailRow, LabeledDetail } from '../../../stops/stop-details/layout';
 import { StopAreaComponentProps } from './StopAreaComponentProps';
+import { StopPlaceWithDetails } from '../../../../../hooks';
 
 const testIds = {
   name: 'StopAreaDetails::name',
+  nameFin: 'StopAreaDetails::nameFin',
+  nameSwe: 'StopAreaDetails::nameSwe',
   description: 'StopAreaDetails::description',
   parentStopPlace: 'StopAreaDetails::parentStopPlace',
   areaSize: 'StopAreaDetails::areaSize',
   validityPeriod: 'StopAreaDetails::validityPeriod',
 };
 
-function validityPeriod(area: StopAreaDetailsFragment) {
-  const from = mapToShortDate(area.validBetween?.fromDate);
-  const to = mapToShortDate(area.validBetween?.toDate);
+function validityPeriod(area: StopPlaceWithDetails) {
+  const from = mapToShortDate(area.stop_place?.validityStart);
+  const to = mapToShortDate(area.stop_place?.validityEnd);
 
   if (from || to) {
     return `${from ?? ''}-${to ?? ''}`;
@@ -31,17 +33,19 @@ export const StopAreaDetailsView: FC<StopAreaComponentProps> = ({
 }) => {
   const { t } = useTranslation();
 
+  console.log(area)
+
   return (
     <DetailRow className={twMerge('mb-0 flex-grow flex-wrap py-0', className)}>
       <LabeledDetail
         title={t('stopAreaDetails.basicDetails.name')}
-        detail={area.name?.value}
+        detail={area.stop_place?.name}
         testId={testIds.name}
       />
       <LabeledDetail
-        title={t('stopAreaDetails.basicDetails.description')}
-        detail={area.description?.value}
-        testId={testIds.description}
+        title={t('stopDetails.basicDetails.nameSwe')}
+        detail={area.stop_place?.nameSwe}
+        testId={testIds.nameSwe}
       />
       <LabeledDetail
         title={t('stopAreaDetails.basicDetails.parentTerminal')}
diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMemberStopRows.tsx b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMemberStopRows.tsx
index b7d4aa940..4b067bca0 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMemberStopRows.tsx
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMemberStopRows.tsx
@@ -3,7 +3,6 @@ import groupBy from 'lodash/groupBy';
 import { FC } from 'react';
 import { useTranslation } from 'react-i18next';
 import { twMerge } from 'tailwind-merge';
-import { StopAreaDetailsFragment } from '../../../../../generated/graphql';
 import { Priority } from '../../../../../types/enums';
 import { StopAreaFormMember } from '../../../../forms/stop-area';
 import { StopSearchRow, StopTableRow } from '../../../search';
@@ -14,9 +13,11 @@ import { mapMembersToStopSearchFormat } from '../utils';
 import { EditModeActionButton } from './MemberStopMenuActionButtons/EditModeActionButton';
 import { RemoveMemberStop } from './MemberStopMenuItems/RemoveMemberStop';
 import { StopAreaComponentProps } from './StopAreaComponentProps';
+import { StopPlaceWithDetails } from '../../../../../hooks';
+import { StopPlaceDetailsFragment } from '../../../../../generated/graphql';
 
 type StopAreaMemberRow = {
-  readonly stop: StopSearchRow;
+  readonly quay: StopSearchRow;
   readonly selected: boolean;
   readonly added: boolean;
 };
@@ -81,8 +82,8 @@ function tagRowWithStatusText(
 ): StopAreaMemberRow {
   return {
     ...row,
-    stop: {
-      ...row.stop,
+    quay: {
+      ...row.quay,
       timing_place: {
         __typename: 'timing_pattern_timing_place',
         timing_place_id: '',
@@ -94,15 +95,15 @@ function tagRowWithStatusText(
 
 function mapRows(
   t: TFunction,
-  area: StopAreaDetailsFragment,
+  area: StopPlaceWithDetails,
   inEditMode: boolean,
   inEditSelectedStops: ReadonlyArray<StopAreaFormMember>,
 ): Array<StopAreaMemberRow> {
   const existingAreaMembers = mapMembersToStopSearchFormat(area);
 
   if (!inEditMode) {
-    return existingAreaMembers.map((stop) => ({
-      stop,
+    return existingAreaMembers.map((quay) => ({
+      quay,
       selected: true,
       added: false,
     }));
@@ -120,12 +121,12 @@ function mapRows(
     .map(stopAreaFormMemberToStopSearchRow);
 
   return [
-    ...selected.map((stop) => ({ stop, selected: true, added: false })),
-    ...removed.map((stop) => ({ stop, selected: false, added: false })),
-    ...added.map((stop) => ({ stop, selected: true, added: true })),
+    ...selected.map((quay) => ({ quay, selected: true, added: false })),
+    ...removed.map((quay) => ({ quay, selected: false, added: false })),
+    ...added.map((quay) => ({ quay, selected: true, added: true })),
   ]
     .map((row) => tagRowWithStatusText(t, row))
-    .sort((a, b) => a.stop.label.localeCompare(b.stop.label));
+    .sort((a, b) => a.quay.label.localeCompare(b.quay.label));
 }
 
 function getRowBgClassName(added: boolean, selected: boolean) {
@@ -166,32 +167,32 @@ export const StopAreaMemberStopRows: FC<StopAreaMemberStopRowsProps> = ({
     >
       <tbody>
         {mapRows(t, area, inEditMode, inEditSelectedStops).map(
-          ({ stop, selected, added }) => (
+          ({ quay, selected, added }) => (
             <StopTableRow
               className={getRowBgClassName(added, selected)}
-              key={stop.scheduled_stop_point_id}
+              key={quay.scheduled_stop_point_id}
               inEditMode={inEditMode}
-              stop={stop}
+              stop={quay}
               actionButtons={
                 inEditMode ? (
                   <EditModeActionButton
                     onAddBack={onAddBack}
                     onRemove={onRemove}
                     selected={selected}
-                    stop={stop}
+                    stop={quay}
                   />
                 ) : (
-                  <LocatorActionButton stop={stop} />
+                  <LocatorActionButton stop={quay} />
                 )
               }
               menuItems={[
-                <OpenDetailsPage key="OpenDetailsPage" stop={stop} />,
+                <OpenDetailsPage key="OpenDetailsPage" stop={quay} />,
                 <RemoveMemberStop
                   key="RemoveMemberStop"
-                  stop={stop}
+                  stop={quay}
                   onRemove={onRemove}
                 />,
-                <ShowOnMap key="ShowOnMap" stop={stop} />,
+                <ShowOnMap key="ShowOnMap" stop={quay} />,
               ]}
             />
           ),
diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMemberStops.tsx b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMemberStops.tsx
index db3275b2a..a8060d33c 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMemberStops.tsx
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMemberStops.tsx
@@ -138,7 +138,7 @@ export const StopAreaMemberStops: FC<EditableStopAreaComponentProps> = ({
 
     methods,
   } = useMemberStopFormControls(
-    area.id,
+    area.stop_place?.id,
     defaultValues,
     onEditBlock,
     refetch,
@@ -194,7 +194,7 @@ export const StopAreaMemberStops: FC<EditableStopAreaComponentProps> = ({
           <h2>{t('stopAreaDetails.memberStops.title')}</h2>
 
           <StopAreaMemberStopsHeader
-            areaId={area.id}
+            areaId={area.stop_place?.id}
             blockInEdit={blockInEdit}
             onCancel={onCancelEdit}
             onEditStops={onEditStops}
diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMinimap.tsx b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMinimap.tsx
index a799dc2e5..8298e7464 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMinimap.tsx
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaMinimap.tsx
@@ -20,7 +20,7 @@ export const StopAreaMinimap: FC<StopAreaComponentProps> = ({
   const { t } = useTranslation();
   const showOnMap = useShowStopAreaOnMap();
 
-  const point = mapLngLatToPoint(area.geometry?.coordinates ?? []);
+  // const point = mapLngLatToPoint(area.stop_place?.geometry?.coordinates ?? []);
 
   return (
     <div
@@ -37,17 +37,17 @@ export const StopAreaMinimap: FC<StopAreaComponentProps> = ({
         <br />
         <span
           data-testid={testIds.marker}
-          data-longitude={point.longitude}
-          data-latitude={point.latitude}
+          data-longitude={area.stop_place?.locationLong}
+          data-latitude={area.stop_place?.locationLat}
         >
-          {area.description?.value}
+          {area.stop_place?.name}
         </span>
       </div>
 
       <SlimSimpleButton
         className="absolute right-2 top-2"
         inverted
-        onClick={() => showOnMap(area.id ?? undefined, point)}
+        onClick={() => showOnMap(area.stop_place?.id ?? undefined, point)}
         testId={testIds.openMapButton}
       >
         {t('stopAreaDetails.minimap.showOnMap')}
diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaTitleRow.tsx b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaTitleRow.tsx
index 141d0a864..71d051cb3 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaTitleRow.tsx
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaTitleRow.tsx
@@ -2,6 +2,8 @@ import { FC } from 'react';
 import { twMerge } from 'tailwind-merge';
 import { ObservationDateControl } from '../../../../common/ObservationDateControl';
 import { StopAreaComponentProps } from './StopAreaComponentProps';
+import { StopTypeLabel } from '../../../stops/stop-details/StopTypeLabel';
+import { useTranslation } from 'react-i18next';
 
 const testIds = {
   description: 'StopAreaTitleRow::description',
@@ -11,19 +13,31 @@ const testIds = {
 export const StopAreaTitleRow: FC<StopAreaComponentProps> = ({
   area,
   className = '',
-}) => (
-  <div className={twMerge('flex items-center', className)}>
-    <i className="icon-bus-alt mr-2 text-3xl text-tweaked-brand" />
-    <h2 className="mr-2 font-bold" data-testid={testIds.name}>
-      {area.name?.value ?? null}
-    </h2>
+}) => {
+  const { t } = useTranslation(); 
+  
+  return (
+    <div className={twMerge('flex items-center', className)}>
+      <i className="icon-bus-alt mr-2 text-3xl text-tweaked-brand" />
+      <h2 className="mr-2 font-bold" data-testid={testIds.name}>
+        {area.stop_place?.name ?? null}
+      </h2>
 
-    <div className="text-xl" data-testid={testIds.description}>
-      {area.description?.value ?? null}
-    </div>
+      <div className="text-xl" data-testid={testIds.description}>
+        <StopTypeLabel
+          hasType={!!area?.stop_place?.weighting}
+          text={t('stopPlaceTypes.interchange')}
+        />
+
+        <StopTypeLabel
+          hasType={!!area?.stop_place?.submode}
+          text={t('stopPlaceTypes.railReplacement')}
+        />
+      </div>
 
-    <div className="flex-grow" />
+      <div className="flex-grow" />
 
-    <ObservationDateControl containerClassName="w-1/6" />
-  </div>
-);
+      <ObservationDateControl containerClassName="w-1/6" />
+    </div>
+  );
+}
\ No newline at end of file
diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaVersioningRow.tsx b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaVersioningRow.tsx
index 0e728f8c6..249f6c9c0 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaVersioningRow.tsx
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/components/StopAreaVersioningRow.tsx
@@ -23,9 +23,9 @@ export const StopAreaVersioningRow: FC<StopAreaComponentProps> = ({
         title={t('accessibility:stops.validityPeriod')}
         data-testid={testIds.validityPeriod}
       >
-        {mapToShortDate(area.validBetween?.fromDate)}
+        {mapToShortDate(area.stop_place?.validityStart)}
         <span className="mx-1">-</span>
-        {mapToShortDate(area.validBetween?.toDate)}
+        {mapToShortDate(area.stop_place?.validityEnd)}
       </div>
     </div>
   );
diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/useGetStopAreaDetails.ts b/ui/src/components/stop-registry/stop-areas/stop-area-details/useGetStopAreaDetails.ts
index 3847b9e4e..2e543414b 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/useGetStopAreaDetails.ts
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/useGetStopAreaDetails.ts
@@ -4,26 +4,31 @@ import {
   useGetStopAreaDetailsQuery,
 } from '../../../../generated/graphql';
 
+/* Turha file? */ 
+
 const GQL_GET_STOP_AREA_DETAILS = gql`
   query getStopAreaDetails($id: String!) {
     stop_registry {
-      groupOfStopPlaces(id: $id) {
+      stopPlace(id: $id) {
         ...StopAreaDetails
       }
     }
   }
 
-  fragment StopAreaDetails on stop_registry_GroupOfStopPlaces {
+  fragment StopAreaDetails on stop_registry_StopPlace {
     id
 
-    geometry {
-      type
-      coordinates
+    alternativeNames {
+      name {
+        lang
+        value
+      }
+      nameType
     }
 
-    description {
-      lang
+    privateCode {
       value
+      type
     }
 
     name {
@@ -31,26 +36,29 @@ const GQL_GET_STOP_AREA_DETAILS = gql`
       value
     }
 
-    validBetween {
-      fromDate
-      toDate
+    organisations {
+      relationshipType
+      organisationRef
+      organisation {
+        ...stop_place_organisation_fields
+      }
     }
 
-    members {
-      ...StopAreaDetailsMembers
+    geometry {
+      type
+      coordinates
     }
-  }
-
-  fragment StopAreaDetailsMembers on stop_registry_StopPlace {
-    id
 
-    name {
-      lang
-      value
+    keyValues {
+      key
+      values
     }
 
-    scheduled_stop_point {
-      ...stop_table_row
+    weighting
+    submode
+
+    quays {
+      ...quay_details
     }
   }
 `;
@@ -58,6 +66,6 @@ const GQL_GET_STOP_AREA_DETAILS = gql`
 export function useGetStopAreaDetails(id: string) {
   const { data, ...rest } = useGetStopAreaDetailsQuery({ variables: { id } });
   const area: StopAreaDetailsFragment | null =
-    data?.stop_registry?.groupOfStopPlaces?.at(0) ?? null;
+    data?.stop_registry?.stopPlace?.at(0) ?? null;
   return { ...rest, area };
 }
diff --git a/ui/src/components/stop-registry/stop-areas/stop-area-details/utils.ts b/ui/src/components/stop-registry/stop-areas/stop-area-details/utils.ts
index 621dcc72e..9a25cb125 100644
--- a/ui/src/components/stop-registry/stop-areas/stop-area-details/utils.ts
+++ b/ui/src/components/stop-registry/stop-areas/stop-area-details/utils.ts
@@ -1,33 +1,33 @@
 import {
+  QuayDetailsFragment,
   StopAreaDetailsFragment,
-  StopAreaDetailsMembersFragment,
+  StopPlaceDetailsFragment,
 } from '../../../../generated/graphql';
+import { StopPlaceWithDetails } from '../../../../hooks';
 import { getStopPlacesFromQueryResult, notNullish } from '../../../../utils';
 import { StopSearchRow } from '../../search';
 
 export function mapMemberToStopSearchFormat(
-  member: StopAreaDetailsMembersFragment,
+  quay: QuayDetailsFragment,
 ): StopSearchRow | null {
-  if (!member.scheduled_stop_point) {
+  if (!quay.scheduled_stop_point) {
     return null;
   }
 
   return {
-    ...member.scheduled_stop_point,
+    ...quay.scheduled_stop_point,
     quay: {
-      netexId: member.id,
-      nameFin: member.name?.value,
+      netexId: quay.id,
+      nameFin: quay.description?.value,
       nameSwe: null,
     },
   };
 }
 
 export function mapMembersToStopSearchFormat(
-  area: StopAreaDetailsFragment,
+  area: StopPlaceWithDetails,
 ): Array<StopSearchRow> {
-  return getStopPlacesFromQueryResult<StopAreaDetailsMembersFragment>(
-    area.members,
-  )
+  return (area.stop_place?.quays ?? [])
     .map(mapMemberToStopSearchFormat)
     .filter(notNullish);
-}
+}
\ No newline at end of file
diff --git a/ui/src/generated/graphql.tsx b/ui/src/generated/graphql.tsx
index abde524b7..f7e5f94a6 100644
--- a/ui/src/generated/graphql.tsx
+++ b/ui/src/generated/graphql.tsx
@@ -69204,137 +69204,192 @@ export type GetStopAreaDetailsQuery = {
   __typename?: 'query_root';
   stop_registry?: {
     __typename?: 'stop_registryStopPlaceRegister';
-    groupOfStopPlaces?: Array<{
-      __typename?: 'stop_registry_GroupOfStopPlaces';
-      id?: string | null;
-      geometry?: {
-        __typename?: 'stop_registry_GeoJSON';
-        type?: StopRegistryGeoJsonType | null;
-        coordinates?: GeoJSON.Position | null;
-      } | null;
-      description?: {
-        __typename?: 'stop_registry_EmbeddableMultilingualString';
-        lang?: string | null;
-        value?: string | null;
-      } | null;
-      name?: {
-        __typename?: 'stop_registry_EmbeddableMultilingualString';
-        lang?: string | null;
-        value?: string | null;
-      } | null;
-      validBetween?: {
-        __typename?: 'stop_registry_ValidBetween';
-        fromDate?: luxon.DateTime | null;
-        toDate?: luxon.DateTime | null;
-      } | null;
-      members?: Array<
-        | { __typename?: 'stop_registry_ParentStopPlace' }
-        | {
-            __typename?: 'stop_registry_StopPlace';
-            id?: string | null;
-            name?: {
+    stopPlace?: Array<
+      | { __typename?: 'stop_registry_ParentStopPlace' }
+      | {
+          __typename?: 'stop_registry_StopPlace';
+          id?: string | null;
+          weighting?: StopRegistryInterchangeWeightingType | null;
+          submode?: StopRegistrySubmodeType | null;
+          alternativeNames?: Array<{
+            __typename?: 'stop_registry_AlternativeName';
+            nameType: StopRegistryNameType;
+            name: {
               __typename?: 'stop_registry_EmbeddableMultilingualString';
               lang?: string | null;
               value?: string | null;
-            } | null;
-            scheduled_stop_point?: {
-              __typename?: 'service_pattern_scheduled_stop_point';
-              scheduled_stop_point_id: UUID;
-              label: string;
-              measured_location: GeoJSON.Point;
-              validity_start?: luxon.DateTime | null;
-              validity_end?: luxon.DateTime | null;
-              timing_place_id?: UUID | null;
-              priority: number;
-              timing_place?: {
-                __typename?: 'timing_pattern_timing_place';
-                timing_place_id: UUID;
-                label: string;
+            };
+          } | null> | null;
+          privateCode?: {
+            __typename?: 'stop_registry_PrivateCode';
+            value?: string | null;
+            type?: string | null;
+          } | null;
+          name?: {
+            __typename?: 'stop_registry_EmbeddableMultilingualString';
+            lang?: string | null;
+            value?: string | null;
+          } | null;
+          organisations?: Array<{
+            __typename?: 'stop_registry_StopPlaceOrganisationRef';
+            relationshipType?: StopRegistryStopPlaceOrganisationRelationshipType | null;
+            organisationRef: string;
+            organisation?: {
+              __typename?: 'stop_registry_Organisation';
+              id?: string | null;
+              name?: string | null;
+              privateContactDetails?: {
+                __typename?: 'stop_registry_Contact';
+                id?: string | null;
+                email?: string | null;
+                phone?: string | null;
               } | null;
             } | null;
-          }
-        | null
-      > | null;
-    } | null> | null;
+          } | null> | null;
+          geometry?: {
+            __typename?: 'stop_registry_GeoJSON';
+            type?: StopRegistryGeoJsonType | null;
+            coordinates?: GeoJSON.Position | null;
+          } | null;
+          keyValues?: Array<{
+            __typename?: 'stop_registry_KeyValues';
+            key?: string | null;
+            values?: Array<string | null> | null;
+          } | null> | null;
+          quays?: Array<{
+            __typename?: 'stop_registry_Quay';
+            id?: string | null;
+            publicCode?: string | null;
+            alternativeNames?: Array<{
+              __typename?: 'stop_registry_AlternativeName';
+              nameType: StopRegistryNameType;
+              name: {
+                __typename?: 'stop_registry_EmbeddableMultilingualString';
+                lang?: string | null;
+                value?: string | null;
+              };
+            } | null> | null;
+            placeEquipments?: {
+              __typename?: 'stop_registry_PlaceEquipments';
+              id?: string | null;
+              shelterEquipment?: Array<{
+                __typename?: 'stop_registry_ShelterEquipment';
+                id?: string | null;
+                enclosed?: boolean | null;
+                stepFree?: boolean | null;
+                shelterType?: StopRegistryShelterType | null;
+                shelterElectricity?: StopRegistryShelterElectricity | null;
+                shelterLighting?: boolean | null;
+                shelterCondition?: StopRegistryShelterCondition | null;
+                timetableCabinets?: number | null;
+                trashCan?: boolean | null;
+                shelterHasDisplay?: boolean | null;
+                bicycleParking?: boolean | null;
+                leaningRail?: boolean | null;
+                outsideBench?: boolean | null;
+                shelterFasciaBoardTaping?: boolean | null;
+              } | null> | null;
+              cycleStorageEquipment?: Array<{
+                __typename?: 'stop_registry_CycleStorageEquipment';
+                cycleStorageType?: StopRegistryCycleStorageType | null;
+              } | null> | null;
+            } | null;
+          } | null> | null;
+        }
+      | null
+    > | null;
   } | null;
 };
 
 export type StopAreaDetailsFragment = {
-  __typename?: 'stop_registry_GroupOfStopPlaces';
+  __typename?: 'stop_registry_StopPlace';
   id?: string | null;
-  geometry?: {
-    __typename?: 'stop_registry_GeoJSON';
-    type?: StopRegistryGeoJsonType | null;
-    coordinates?: GeoJSON.Position | null;
-  } | null;
-  description?: {
-    __typename?: 'stop_registry_EmbeddableMultilingualString';
-    lang?: string | null;
+  weighting?: StopRegistryInterchangeWeightingType | null;
+  submode?: StopRegistrySubmodeType | null;
+  alternativeNames?: Array<{
+    __typename?: 'stop_registry_AlternativeName';
+    nameType: StopRegistryNameType;
+    name: {
+      __typename?: 'stop_registry_EmbeddableMultilingualString';
+      lang?: string | null;
+      value?: string | null;
+    };
+  } | null> | null;
+  privateCode?: {
+    __typename?: 'stop_registry_PrivateCode';
     value?: string | null;
+    type?: string | null;
   } | null;
   name?: {
     __typename?: 'stop_registry_EmbeddableMultilingualString';
     lang?: string | null;
     value?: string | null;
   } | null;
-  validBetween?: {
-    __typename?: 'stop_registry_ValidBetween';
-    fromDate?: luxon.DateTime | null;
-    toDate?: luxon.DateTime | null;
-  } | null;
-  members?: Array<
-    | { __typename?: 'stop_registry_ParentStopPlace' }
-    | {
-        __typename?: 'stop_registry_StopPlace';
+  organisations?: Array<{
+    __typename?: 'stop_registry_StopPlaceOrganisationRef';
+    relationshipType?: StopRegistryStopPlaceOrganisationRelationshipType | null;
+    organisationRef: string;
+    organisation?: {
+      __typename?: 'stop_registry_Organisation';
+      id?: string | null;
+      name?: string | null;
+      privateContactDetails?: {
+        __typename?: 'stop_registry_Contact';
         id?: string | null;
-        name?: {
-          __typename?: 'stop_registry_EmbeddableMultilingualString';
-          lang?: string | null;
-          value?: string | null;
-        } | null;
-        scheduled_stop_point?: {
-          __typename?: 'service_pattern_scheduled_stop_point';
-          scheduled_stop_point_id: UUID;
-          label: string;
-          measured_location: GeoJSON.Point;
-          validity_start?: luxon.DateTime | null;
-          validity_end?: luxon.DateTime | null;
-          timing_place_id?: UUID | null;
-          priority: number;
-          timing_place?: {
-            __typename?: 'timing_pattern_timing_place';
-            timing_place_id: UUID;
-            label: string;
-          } | null;
-        } | null;
-      }
-    | null
-  > | null;
-};
-
-export type StopAreaDetailsMembersFragment = {
-  __typename?: 'stop_registry_StopPlace';
-  id?: string | null;
-  name?: {
-    __typename?: 'stop_registry_EmbeddableMultilingualString';
-    lang?: string | null;
-    value?: string | null;
+        email?: string | null;
+        phone?: string | null;
+      } | null;
+    } | null;
+  } | null> | null;
+  geometry?: {
+    __typename?: 'stop_registry_GeoJSON';
+    type?: StopRegistryGeoJsonType | null;
+    coordinates?: GeoJSON.Position | null;
   } | null;
-  scheduled_stop_point?: {
-    __typename?: 'service_pattern_scheduled_stop_point';
-    scheduled_stop_point_id: UUID;
-    label: string;
-    measured_location: GeoJSON.Point;
-    validity_start?: luxon.DateTime | null;
-    validity_end?: luxon.DateTime | null;
-    timing_place_id?: UUID | null;
-    priority: number;
-    timing_place?: {
-      __typename?: 'timing_pattern_timing_place';
-      timing_place_id: UUID;
-      label: string;
+  keyValues?: Array<{
+    __typename?: 'stop_registry_KeyValues';
+    key?: string | null;
+    values?: Array<string | null> | null;
+  } | null> | null;
+  quays?: Array<{
+    __typename?: 'stop_registry_Quay';
+    id?: string | null;
+    publicCode?: string | null;
+    alternativeNames?: Array<{
+      __typename?: 'stop_registry_AlternativeName';
+      nameType: StopRegistryNameType;
+      name: {
+        __typename?: 'stop_registry_EmbeddableMultilingualString';
+        lang?: string | null;
+        value?: string | null;
+      };
+    } | null> | null;
+    placeEquipments?: {
+      __typename?: 'stop_registry_PlaceEquipments';
+      id?: string | null;
+      shelterEquipment?: Array<{
+        __typename?: 'stop_registry_ShelterEquipment';
+        id?: string | null;
+        enclosed?: boolean | null;
+        stepFree?: boolean | null;
+        shelterType?: StopRegistryShelterType | null;
+        shelterElectricity?: StopRegistryShelterElectricity | null;
+        shelterLighting?: boolean | null;
+        shelterCondition?: StopRegistryShelterCondition | null;
+        timetableCabinets?: number | null;
+        trashCan?: boolean | null;
+        shelterHasDisplay?: boolean | null;
+        bicycleParking?: boolean | null;
+        leaningRail?: boolean | null;
+        outsideBench?: boolean | null;
+        shelterFasciaBoardTaping?: boolean | null;
+      } | null> | null;
+      cycleStorageEquipment?: Array<{
+        __typename?: 'stop_registry_CycleStorageEquipment';
+        cycleStorageType?: StopRegistryCycleStorageType | null;
+      } | null> | null;
     } | null;
-  } | null;
+  } | null> | null;
 };
 
 export type FindExistingPosterNamesQueryVariables = Exact<{
@@ -72751,26 +72806,8 @@ export type UpdateStopPlaceMutation = {
     mutateStopPlace?: Array<{
       __typename?: 'stop_registry_StopPlace';
       id?: string | null;
-      transportMode?: StopRegistryTransportModeType | null;
-      stopPlaceType?: StopRegistryStopPlaceType | null;
       weighting?: StopRegistryInterchangeWeightingType | null;
       submode?: StopRegistrySubmodeType | null;
-      publicCode?: string | null;
-      name?: {
-        __typename?: 'stop_registry_EmbeddableMultilingualString';
-        lang?: string | null;
-        value?: string | null;
-      } | null;
-      description?: {
-        __typename?: 'stop_registry_EmbeddableMultilingualString';
-        lang?: string | null;
-        value?: string | null;
-      } | null;
-      shortName?: {
-        __typename?: 'stop_registry_EmbeddableMultilingualString';
-        lang?: string | null;
-        value?: string | null;
-      } | null;
       alternativeNames?: Array<{
         __typename?: 'stop_registry_AlternativeName';
         nameType: StopRegistryNameType;
@@ -72780,60 +72817,42 @@ export type UpdateStopPlaceMutation = {
           value?: string | null;
         };
       } | null> | null;
-      keyValues?: Array<{
-        __typename?: 'stop_registry_KeyValues';
-        key?: string | null;
-        values?: Array<string | null> | null;
-      } | null> | null;
       privateCode?: {
         __typename?: 'stop_registry_PrivateCode';
         value?: string | null;
         type?: string | null;
       } | null;
+      name?: {
+        __typename?: 'stop_registry_EmbeddableMultilingualString';
+        lang?: string | null;
+        value?: string | null;
+      } | null;
+      organisations?: Array<{
+        __typename?: 'stop_registry_StopPlaceOrganisationRef';
+        relationshipType?: StopRegistryStopPlaceOrganisationRelationshipType | null;
+        organisationRef: string;
+        organisation?: {
+          __typename?: 'stop_registry_Organisation';
+          id?: string | null;
+          name?: string | null;
+          privateContactDetails?: {
+            __typename?: 'stop_registry_Contact';
+            id?: string | null;
+            email?: string | null;
+            phone?: string | null;
+          } | null;
+        } | null;
+      } | null> | null;
       geometry?: {
         __typename?: 'stop_registry_GeoJSON';
-        coordinates?: GeoJSON.Position | null;
         type?: StopRegistryGeoJsonType | null;
+        coordinates?: GeoJSON.Position | null;
       } | null;
-      topographicPlace?: {
-        __typename?: 'stop_registry_TopographicPlace';
-        id?: string | null;
-        name?: {
-          __typename?: 'stop_registry_EmbeddableMultilingualString';
-          value?: string | null;
-          lang?: string | null;
-        } | null;
-      } | null;
-      fareZones?: Array<{
-        __typename?: 'stop_registry_FareZone';
-        id?: string | null;
-        name?: {
-          __typename?: 'stop_registry_EmbeddableMultilingualString';
-          value?: string | null;
-          lang?: string | null;
-        } | null;
+      keyValues?: Array<{
+        __typename?: 'stop_registry_KeyValues';
+        key?: string | null;
+        values?: Array<string | null> | null;
       } | null> | null;
-      placeEquipments?: {
-        __typename?: 'stop_registry_PlaceEquipments';
-        generalSign?: Array<{
-          __typename?: 'stop_registry_GeneralSign';
-          signContentType?: StopRegistrySignContentType | null;
-          numberOfFrames?: number | null;
-          lineSignage?: boolean | null;
-          mainLineSign?: boolean | null;
-          replacesRailSign?: boolean | null;
-          privateCode?: {
-            __typename?: 'stop_registry_PrivateCode';
-            value?: string | null;
-            type?: string | null;
-          } | null;
-          note?: {
-            __typename?: 'stop_registry_EmbeddableMultilingualString';
-            lang?: string | null;
-            value?: string | null;
-          } | null;
-        } | null> | null;
-      } | null;
       quays?: Array<{
         __typename?: 'stop_registry_Quay';
         id?: string | null;
@@ -72873,104 +72892,6 @@ export type UpdateStopPlaceMutation = {
           } | null> | null;
         } | null;
       } | null> | null;
-      accessibilityAssessment?: {
-        __typename?: 'stop_registry_AccessibilityAssessment';
-        id?: string | null;
-        hslAccessibilityProperties?: {
-          __typename?: 'stop_registry_HslAccessibilityProperties';
-          id?: string | null;
-          stopAreaSideSlope?: number | null;
-          stopAreaLengthwiseSlope?: number | null;
-          endRampSlope?: number | null;
-          shelterLaneDistance?: number | null;
-          curbBackOfRailDistance?: number | null;
-          curbDriveSideOfRailDistance?: number | null;
-          structureLaneDistance?: number | null;
-          stopElevationFromRailTop?: number | null;
-          stopElevationFromSidewalk?: number | null;
-          lowerCleatHeight?: number | null;
-          serviceAreaWidth?: number | null;
-          serviceAreaLength?: number | null;
-          platformEdgeWarningArea?: boolean | null;
-          guidanceTiles?: boolean | null;
-          guidanceStripe?: boolean | null;
-          serviceAreaStripes?: boolean | null;
-          sidewalkAccessibleConnection?: boolean | null;
-          stopAreaSurroundingsAccessible?: boolean | null;
-          curvedStop?: boolean | null;
-          stopType?: StopRegistryStopType | null;
-          shelterType?: StopRegistryShelterWidthType | null;
-          guidanceType?: StopRegistryGuidanceType | null;
-          mapType?: StopRegistryMapType | null;
-          pedestrianCrossingRampType?: StopRegistryPedestrianCrossingRampType | null;
-          accessibilityLevel?: StopRegistryAccessibilityLevel | null;
-        } | null;
-        limitations?: {
-          __typename?: 'stop_registry_AccessibilityLimitations';
-          id?: string | null;
-          version?: string | null;
-          audibleSignalsAvailable?: StopRegistryLimitationStatusType | null;
-          escalatorFreeAccess?: StopRegistryLimitationStatusType | null;
-          liftFreeAccess?: StopRegistryLimitationStatusType | null;
-          stepFreeAccess?: StopRegistryLimitationStatusType | null;
-          wheelchairAccess?: StopRegistryLimitationStatusType | null;
-        } | null;
-      } | null;
-      organisations?: Array<{
-        __typename?: 'stop_registry_StopPlaceOrganisationRef';
-        relationshipType?: StopRegistryStopPlaceOrganisationRelationshipType | null;
-        organisationRef: string;
-        organisation?: {
-          __typename?: 'stop_registry_Organisation';
-          id?: string | null;
-          name?: string | null;
-          privateContactDetails?: {
-            __typename?: 'stop_registry_Contact';
-            id?: string | null;
-            email?: string | null;
-            phone?: string | null;
-          } | null;
-        } | null;
-      } | null> | null;
-      infoSpots?: Array<{
-        __typename?: 'stop_registry_infoSpot';
-        id?: string | null;
-        backlight?: boolean | null;
-        displayType?: StopRegistryDisplayType | null;
-        floor?: string | null;
-        label?: string | null;
-        posterPlaceSize?: StopRegistryPosterPlaceSize | null;
-        infoSpotLocations?: Array<string | null> | null;
-        infoSpotType?: StopRegistryInfoSpotType | null;
-        purpose?: string | null;
-        railInformation?: string | null;
-        speechProperty?: boolean | null;
-        zoneLabel?: string | null;
-        maintenance?: string | null;
-        description?: {
-          __typename?: 'stop_registry_EmbeddableMultilingualString';
-          lang?: string | null;
-          value?: string | null;
-        } | null;
-        poster?: Array<{
-          __typename?: 'stop_registry_poster';
-          label?: string | null;
-          posterSize?: StopRegistryPosterPlaceSize | null;
-          lines?: string | null;
-        } | null> | null;
-      } | null> | null;
-      groups?: Array<{
-        __typename?: 'stop_registry_GroupOfStopPlaces';
-        id?: string | null;
-      } | null> | null;
-      adjacentSites?: Array<{
-        __typename?: 'stop_registry_VersionLessEntityRef';
-        ref?: string | null;
-      } | null> | null;
-      tariffZones?: Array<{
-        __typename?: 'stop_registry_TariffZone';
-        id?: string | null;
-      } | null> | null;
     } | null> | null;
   } | null;
 };
@@ -73062,26 +72983,122 @@ export type GetHighestPriorityStopDetailsByLabelAndDateQuery = {
       | {
           __typename?: 'stop_registry_StopPlace';
           id?: string | null;
-          transportMode?: StopRegistryTransportModeType | null;
-          stopPlaceType?: StopRegistryStopPlaceType | null;
           weighting?: StopRegistryInterchangeWeightingType | null;
           submode?: StopRegistrySubmodeType | null;
-          publicCode?: string | null;
-          name?: {
-            __typename?: 'stop_registry_EmbeddableMultilingualString';
-            lang?: string | null;
+          alternativeNames?: Array<{
+            __typename?: 'stop_registry_AlternativeName';
+            nameType: StopRegistryNameType;
+            name: {
+              __typename?: 'stop_registry_EmbeddableMultilingualString';
+              lang?: string | null;
+              value?: string | null;
+            };
+          } | null> | null;
+          privateCode?: {
+            __typename?: 'stop_registry_PrivateCode';
             value?: string | null;
+            type?: string | null;
           } | null;
-          description?: {
+          name?: {
             __typename?: 'stop_registry_EmbeddableMultilingualString';
             lang?: string | null;
             value?: string | null;
           } | null;
-          shortName?: {
-            __typename?: 'stop_registry_EmbeddableMultilingualString';
-            lang?: string | null;
-            value?: string | null;
+          organisations?: Array<{
+            __typename?: 'stop_registry_StopPlaceOrganisationRef';
+            relationshipType?: StopRegistryStopPlaceOrganisationRelationshipType | null;
+            organisationRef: string;
+            organisation?: {
+              __typename?: 'stop_registry_Organisation';
+              id?: string | null;
+              name?: string | null;
+              privateContactDetails?: {
+                __typename?: 'stop_registry_Contact';
+                id?: string | null;
+                email?: string | null;
+                phone?: string | null;
+              } | null;
+            } | null;
+          } | null> | null;
+          geometry?: {
+            __typename?: 'stop_registry_GeoJSON';
+            type?: StopRegistryGeoJsonType | null;
+            coordinates?: GeoJSON.Position | null;
           } | null;
+          keyValues?: Array<{
+            __typename?: 'stop_registry_KeyValues';
+            key?: string | null;
+            values?: Array<string | null> | null;
+          } | null> | null;
+          quays?: Array<{
+            __typename?: 'stop_registry_Quay';
+            id?: string | null;
+            publicCode?: string | null;
+            alternativeNames?: Array<{
+              __typename?: 'stop_registry_AlternativeName';
+              nameType: StopRegistryNameType;
+              name: {
+                __typename?: 'stop_registry_EmbeddableMultilingualString';
+                lang?: string | null;
+                value?: string | null;
+              };
+            } | null> | null;
+            placeEquipments?: {
+              __typename?: 'stop_registry_PlaceEquipments';
+              id?: string | null;
+              shelterEquipment?: Array<{
+                __typename?: 'stop_registry_ShelterEquipment';
+                id?: string | null;
+                enclosed?: boolean | null;
+                stepFree?: boolean | null;
+                shelterType?: StopRegistryShelterType | null;
+                shelterElectricity?: StopRegistryShelterElectricity | null;
+                shelterLighting?: boolean | null;
+                shelterCondition?: StopRegistryShelterCondition | null;
+                timetableCabinets?: number | null;
+                trashCan?: boolean | null;
+                shelterHasDisplay?: boolean | null;
+                bicycleParking?: boolean | null;
+                leaningRail?: boolean | null;
+                outsideBench?: boolean | null;
+                shelterFasciaBoardTaping?: boolean | null;
+              } | null> | null;
+              cycleStorageEquipment?: Array<{
+                __typename?: 'stop_registry_CycleStorageEquipment';
+                cycleStorageType?: StopRegistryCycleStorageType | null;
+              } | null> | null;
+            } | null;
+          } | null> | null;
+        }
+      | null
+    > | null;
+    timing_place?: {
+      __typename?: 'timing_pattern_timing_place';
+      timing_place_id: UUID;
+      label: string;
+    } | null;
+    vehicle_mode_on_scheduled_stop_point: Array<{
+      __typename?: 'service_pattern_vehicle_mode_on_scheduled_stop_point';
+      vehicle_mode: ReusableComponentsVehicleModeEnum;
+    }>;
+  }>;
+};
+
+export type GetStopPlaceDetailsQueryVariables = Exact<{
+  id: Scalars['String']['input'];
+}>;
+
+export type GetStopPlaceDetailsQuery = {
+  __typename?: 'query_root';
+  stop_registry?: {
+    __typename?: 'stop_registryStopPlaceRegister';
+    stopPlace?: Array<
+      | { __typename?: 'stop_registry_ParentStopPlace' }
+      | {
+          __typename?: 'stop_registry_StopPlace';
+          id?: string | null;
+          weighting?: StopRegistryInterchangeWeightingType | null;
+          submode?: StopRegistrySubmodeType | null;
           alternativeNames?: Array<{
             __typename?: 'stop_registry_AlternativeName';
             nameType: StopRegistryNameType;
@@ -73091,60 +73108,42 @@ export type GetHighestPriorityStopDetailsByLabelAndDateQuery = {
               value?: string | null;
             };
           } | null> | null;
-          keyValues?: Array<{
-            __typename?: 'stop_registry_KeyValues';
-            key?: string | null;
-            values?: Array<string | null> | null;
+          privateCode?: {
+            __typename?: 'stop_registry_PrivateCode';
+            value?: string | null;
+            type?: string | null;
+          } | null;
+          name?: {
+            __typename?: 'stop_registry_EmbeddableMultilingualString';
+            lang?: string | null;
+            value?: string | null;
+          } | null;
+          organisations?: Array<{
+            __typename?: 'stop_registry_StopPlaceOrganisationRef';
+            relationshipType?: StopRegistryStopPlaceOrganisationRelationshipType | null;
+            organisationRef: string;
+            organisation?: {
+              __typename?: 'stop_registry_Organisation';
+              id?: string | null;
+              name?: string | null;
+              privateContactDetails?: {
+                __typename?: 'stop_registry_Contact';
+                id?: string | null;
+                email?: string | null;
+                phone?: string | null;
+              } | null;
+            } | null;
           } | null> | null;
-          privateCode?: {
-            __typename?: 'stop_registry_PrivateCode';
-            value?: string | null;
-            type?: string | null;
-          } | null;
           geometry?: {
             __typename?: 'stop_registry_GeoJSON';
-            coordinates?: GeoJSON.Position | null;
             type?: StopRegistryGeoJsonType | null;
+            coordinates?: GeoJSON.Position | null;
           } | null;
-          topographicPlace?: {
-            __typename?: 'stop_registry_TopographicPlace';
-            id?: string | null;
-            name?: {
-              __typename?: 'stop_registry_EmbeddableMultilingualString';
-              value?: string | null;
-              lang?: string | null;
-            } | null;
-          } | null;
-          fareZones?: Array<{
-            __typename?: 'stop_registry_FareZone';
-            id?: string | null;
-            name?: {
-              __typename?: 'stop_registry_EmbeddableMultilingualString';
-              value?: string | null;
-              lang?: string | null;
-            } | null;
+          keyValues?: Array<{
+            __typename?: 'stop_registry_KeyValues';
+            key?: string | null;
+            values?: Array<string | null> | null;
           } | null> | null;
-          placeEquipments?: {
-            __typename?: 'stop_registry_PlaceEquipments';
-            generalSign?: Array<{
-              __typename?: 'stop_registry_GeneralSign';
-              signContentType?: StopRegistrySignContentType | null;
-              numberOfFrames?: number | null;
-              lineSignage?: boolean | null;
-              mainLineSign?: boolean | null;
-              replacesRailSign?: boolean | null;
-              privateCode?: {
-                __typename?: 'stop_registry_PrivateCode';
-                value?: string | null;
-                type?: string | null;
-              } | null;
-              note?: {
-                __typename?: 'stop_registry_EmbeddableMultilingualString';
-                lang?: string | null;
-                value?: string | null;
-              } | null;
-            } | null> | null;
-          } | null;
           quays?: Array<{
             __typename?: 'stop_registry_Quay';
             id?: string | null;
@@ -73184,117 +73183,10 @@ export type GetHighestPriorityStopDetailsByLabelAndDateQuery = {
               } | null> | null;
             } | null;
           } | null> | null;
-          accessibilityAssessment?: {
-            __typename?: 'stop_registry_AccessibilityAssessment';
-            id?: string | null;
-            hslAccessibilityProperties?: {
-              __typename?: 'stop_registry_HslAccessibilityProperties';
-              id?: string | null;
-              stopAreaSideSlope?: number | null;
-              stopAreaLengthwiseSlope?: number | null;
-              endRampSlope?: number | null;
-              shelterLaneDistance?: number | null;
-              curbBackOfRailDistance?: number | null;
-              curbDriveSideOfRailDistance?: number | null;
-              structureLaneDistance?: number | null;
-              stopElevationFromRailTop?: number | null;
-              stopElevationFromSidewalk?: number | null;
-              lowerCleatHeight?: number | null;
-              serviceAreaWidth?: number | null;
-              serviceAreaLength?: number | null;
-              platformEdgeWarningArea?: boolean | null;
-              guidanceTiles?: boolean | null;
-              guidanceStripe?: boolean | null;
-              serviceAreaStripes?: boolean | null;
-              sidewalkAccessibleConnection?: boolean | null;
-              stopAreaSurroundingsAccessible?: boolean | null;
-              curvedStop?: boolean | null;
-              stopType?: StopRegistryStopType | null;
-              shelterType?: StopRegistryShelterWidthType | null;
-              guidanceType?: StopRegistryGuidanceType | null;
-              mapType?: StopRegistryMapType | null;
-              pedestrianCrossingRampType?: StopRegistryPedestrianCrossingRampType | null;
-              accessibilityLevel?: StopRegistryAccessibilityLevel | null;
-            } | null;
-            limitations?: {
-              __typename?: 'stop_registry_AccessibilityLimitations';
-              id?: string | null;
-              version?: string | null;
-              audibleSignalsAvailable?: StopRegistryLimitationStatusType | null;
-              escalatorFreeAccess?: StopRegistryLimitationStatusType | null;
-              liftFreeAccess?: StopRegistryLimitationStatusType | null;
-              stepFreeAccess?: StopRegistryLimitationStatusType | null;
-              wheelchairAccess?: StopRegistryLimitationStatusType | null;
-            } | null;
-          } | null;
-          organisations?: Array<{
-            __typename?: 'stop_registry_StopPlaceOrganisationRef';
-            relationshipType?: StopRegistryStopPlaceOrganisationRelationshipType | null;
-            organisationRef: string;
-            organisation?: {
-              __typename?: 'stop_registry_Organisation';
-              id?: string | null;
-              name?: string | null;
-              privateContactDetails?: {
-                __typename?: 'stop_registry_Contact';
-                id?: string | null;
-                email?: string | null;
-                phone?: string | null;
-              } | null;
-            } | null;
-          } | null> | null;
-          infoSpots?: Array<{
-            __typename?: 'stop_registry_infoSpot';
-            id?: string | null;
-            backlight?: boolean | null;
-            displayType?: StopRegistryDisplayType | null;
-            floor?: string | null;
-            label?: string | null;
-            posterPlaceSize?: StopRegistryPosterPlaceSize | null;
-            infoSpotLocations?: Array<string | null> | null;
-            infoSpotType?: StopRegistryInfoSpotType | null;
-            purpose?: string | null;
-            railInformation?: string | null;
-            speechProperty?: boolean | null;
-            zoneLabel?: string | null;
-            maintenance?: string | null;
-            description?: {
-              __typename?: 'stop_registry_EmbeddableMultilingualString';
-              lang?: string | null;
-              value?: string | null;
-            } | null;
-            poster?: Array<{
-              __typename?: 'stop_registry_poster';
-              label?: string | null;
-              posterSize?: StopRegistryPosterPlaceSize | null;
-              lines?: string | null;
-            } | null> | null;
-          } | null> | null;
-          groups?: Array<{
-            __typename?: 'stop_registry_GroupOfStopPlaces';
-            id?: string | null;
-          } | null> | null;
-          adjacentSites?: Array<{
-            __typename?: 'stop_registry_VersionLessEntityRef';
-            ref?: string | null;
-          } | null> | null;
-          tariffZones?: Array<{
-            __typename?: 'stop_registry_TariffZone';
-            id?: string | null;
-          } | null> | null;
         }
       | null
     > | null;
-    timing_place?: {
-      __typename?: 'timing_pattern_timing_place';
-      timing_place_id: UUID;
-      label: string;
-    } | null;
-    vehicle_mode_on_scheduled_stop_point: Array<{
-      __typename?: 'service_pattern_vehicle_mode_on_scheduled_stop_point';
-      vehicle_mode: ReusableComponentsVehicleModeEnum;
-    }>;
-  }>;
+  } | null;
 };
 
 export type ShelterEquipmentDetailsFragment = {
@@ -73420,26 +73312,8 @@ export type StopPlaceOrganisationFieldsFragment = {
 export type StopPlaceDetailsFragment = {
   __typename?: 'stop_registry_StopPlace';
   id?: string | null;
-  transportMode?: StopRegistryTransportModeType | null;
-  stopPlaceType?: StopRegistryStopPlaceType | null;
   weighting?: StopRegistryInterchangeWeightingType | null;
   submode?: StopRegistrySubmodeType | null;
-  publicCode?: string | null;
-  name?: {
-    __typename?: 'stop_registry_EmbeddableMultilingualString';
-    lang?: string | null;
-    value?: string | null;
-  } | null;
-  description?: {
-    __typename?: 'stop_registry_EmbeddableMultilingualString';
-    lang?: string | null;
-    value?: string | null;
-  } | null;
-  shortName?: {
-    __typename?: 'stop_registry_EmbeddableMultilingualString';
-    lang?: string | null;
-    value?: string | null;
-  } | null;
   alternativeNames?: Array<{
     __typename?: 'stop_registry_AlternativeName';
     nameType: StopRegistryNameType;
@@ -73449,60 +73323,42 @@ export type StopPlaceDetailsFragment = {
       value?: string | null;
     };
   } | null> | null;
-  keyValues?: Array<{
-    __typename?: 'stop_registry_KeyValues';
-    key?: string | null;
-    values?: Array<string | null> | null;
-  } | null> | null;
   privateCode?: {
     __typename?: 'stop_registry_PrivateCode';
     value?: string | null;
     type?: string | null;
   } | null;
+  name?: {
+    __typename?: 'stop_registry_EmbeddableMultilingualString';
+    lang?: string | null;
+    value?: string | null;
+  } | null;
+  organisations?: Array<{
+    __typename?: 'stop_registry_StopPlaceOrganisationRef';
+    relationshipType?: StopRegistryStopPlaceOrganisationRelationshipType | null;
+    organisationRef: string;
+    organisation?: {
+      __typename?: 'stop_registry_Organisation';
+      id?: string | null;
+      name?: string | null;
+      privateContactDetails?: {
+        __typename?: 'stop_registry_Contact';
+        id?: string | null;
+        email?: string | null;
+        phone?: string | null;
+      } | null;
+    } | null;
+  } | null> | null;
   geometry?: {
     __typename?: 'stop_registry_GeoJSON';
-    coordinates?: GeoJSON.Position | null;
     type?: StopRegistryGeoJsonType | null;
+    coordinates?: GeoJSON.Position | null;
   } | null;
-  topographicPlace?: {
-    __typename?: 'stop_registry_TopographicPlace';
-    id?: string | null;
-    name?: {
-      __typename?: 'stop_registry_EmbeddableMultilingualString';
-      value?: string | null;
-      lang?: string | null;
-    } | null;
-  } | null;
-  fareZones?: Array<{
-    __typename?: 'stop_registry_FareZone';
-    id?: string | null;
-    name?: {
-      __typename?: 'stop_registry_EmbeddableMultilingualString';
-      value?: string | null;
-      lang?: string | null;
-    } | null;
+  keyValues?: Array<{
+    __typename?: 'stop_registry_KeyValues';
+    key?: string | null;
+    values?: Array<string | null> | null;
   } | null> | null;
-  placeEquipments?: {
-    __typename?: 'stop_registry_PlaceEquipments';
-    generalSign?: Array<{
-      __typename?: 'stop_registry_GeneralSign';
-      signContentType?: StopRegistrySignContentType | null;
-      numberOfFrames?: number | null;
-      lineSignage?: boolean | null;
-      mainLineSign?: boolean | null;
-      replacesRailSign?: boolean | null;
-      privateCode?: {
-        __typename?: 'stop_registry_PrivateCode';
-        value?: string | null;
-        type?: string | null;
-      } | null;
-      note?: {
-        __typename?: 'stop_registry_EmbeddableMultilingualString';
-        lang?: string | null;
-        value?: string | null;
-      } | null;
-    } | null> | null;
-  } | null;
   quays?: Array<{
     __typename?: 'stop_registry_Quay';
     id?: string | null;
@@ -73542,104 +73398,6 @@ export type StopPlaceDetailsFragment = {
       } | null> | null;
     } | null;
   } | null> | null;
-  accessibilityAssessment?: {
-    __typename?: 'stop_registry_AccessibilityAssessment';
-    id?: string | null;
-    hslAccessibilityProperties?: {
-      __typename?: 'stop_registry_HslAccessibilityProperties';
-      id?: string | null;
-      stopAreaSideSlope?: number | null;
-      stopAreaLengthwiseSlope?: number | null;
-      endRampSlope?: number | null;
-      shelterLaneDistance?: number | null;
-      curbBackOfRailDistance?: number | null;
-      curbDriveSideOfRailDistance?: number | null;
-      structureLaneDistance?: number | null;
-      stopElevationFromRailTop?: number | null;
-      stopElevationFromSidewalk?: number | null;
-      lowerCleatHeight?: number | null;
-      serviceAreaWidth?: number | null;
-      serviceAreaLength?: number | null;
-      platformEdgeWarningArea?: boolean | null;
-      guidanceTiles?: boolean | null;
-      guidanceStripe?: boolean | null;
-      serviceAreaStripes?: boolean | null;
-      sidewalkAccessibleConnection?: boolean | null;
-      stopAreaSurroundingsAccessible?: boolean | null;
-      curvedStop?: boolean | null;
-      stopType?: StopRegistryStopType | null;
-      shelterType?: StopRegistryShelterWidthType | null;
-      guidanceType?: StopRegistryGuidanceType | null;
-      mapType?: StopRegistryMapType | null;
-      pedestrianCrossingRampType?: StopRegistryPedestrianCrossingRampType | null;
-      accessibilityLevel?: StopRegistryAccessibilityLevel | null;
-    } | null;
-    limitations?: {
-      __typename?: 'stop_registry_AccessibilityLimitations';
-      id?: string | null;
-      version?: string | null;
-      audibleSignalsAvailable?: StopRegistryLimitationStatusType | null;
-      escalatorFreeAccess?: StopRegistryLimitationStatusType | null;
-      liftFreeAccess?: StopRegistryLimitationStatusType | null;
-      stepFreeAccess?: StopRegistryLimitationStatusType | null;
-      wheelchairAccess?: StopRegistryLimitationStatusType | null;
-    } | null;
-  } | null;
-  organisations?: Array<{
-    __typename?: 'stop_registry_StopPlaceOrganisationRef';
-    relationshipType?: StopRegistryStopPlaceOrganisationRelationshipType | null;
-    organisationRef: string;
-    organisation?: {
-      __typename?: 'stop_registry_Organisation';
-      id?: string | null;
-      name?: string | null;
-      privateContactDetails?: {
-        __typename?: 'stop_registry_Contact';
-        id?: string | null;
-        email?: string | null;
-        phone?: string | null;
-      } | null;
-    } | null;
-  } | null> | null;
-  infoSpots?: Array<{
-    __typename?: 'stop_registry_infoSpot';
-    id?: string | null;
-    backlight?: boolean | null;
-    displayType?: StopRegistryDisplayType | null;
-    floor?: string | null;
-    label?: string | null;
-    posterPlaceSize?: StopRegistryPosterPlaceSize | null;
-    infoSpotLocations?: Array<string | null> | null;
-    infoSpotType?: StopRegistryInfoSpotType | null;
-    purpose?: string | null;
-    railInformation?: string | null;
-    speechProperty?: boolean | null;
-    zoneLabel?: string | null;
-    maintenance?: string | null;
-    description?: {
-      __typename?: 'stop_registry_EmbeddableMultilingualString';
-      lang?: string | null;
-      value?: string | null;
-    } | null;
-    poster?: Array<{
-      __typename?: 'stop_registry_poster';
-      label?: string | null;
-      posterSize?: StopRegistryPosterPlaceSize | null;
-      lines?: string | null;
-    } | null> | null;
-  } | null> | null;
-  groups?: Array<{
-    __typename?: 'stop_registry_GroupOfStopPlaces';
-    id?: string | null;
-  } | null> | null;
-  adjacentSites?: Array<{
-    __typename?: 'stop_registry_VersionLessEntityRef';
-    ref?: string | null;
-  } | null> | null;
-  tariffZones?: Array<{
-    __typename?: 'stop_registry_TariffZone';
-    id?: string | null;
-  } | null> | null;
 };
 
 export type InfoSpotDetailsFragment = {
@@ -75520,43 +75278,99 @@ export const StopTableRowQuayFragmentDoc = gql`
   ${StopTableRowQuayBaseDetailsFragmentDoc}
   ${StopTableRowFragmentDoc}
 `;
-export const StopAreaDetailsMembersFragmentDoc = gql`
-  fragment StopAreaDetailsMembers on stop_registry_StopPlace {
+export const StopPlaceOrganisationFieldsFragmentDoc = gql`
+  fragment stop_place_organisation_fields on stop_registry_Organisation {
+    id
+    name
+    privateContactDetails {
+      id
+      email
+      phone
+    }
+  }
+`;
+export const ShelterEquipmentDetailsFragmentDoc = gql`
+  fragment shelter_equipment_details on stop_registry_ShelterEquipment {
     id
-    name {
-      lang
-      value
+    enclosed
+    stepFree
+    shelterType
+    shelterElectricity
+    shelterLighting
+    shelterCondition
+    timetableCabinets
+    trashCan
+    shelterHasDisplay
+    bicycleParking
+    leaningRail
+    outsideBench
+    shelterFasciaBoardTaping
+  }
+`;
+export const QuayDetailsFragmentDoc = gql`
+  fragment quay_details on stop_registry_Quay {
+    id
+    publicCode
+    alternativeNames {
+      name {
+        lang
+        value
+      }
+      nameType
     }
-    scheduled_stop_point {
-      ...stop_table_row
+    placeEquipments {
+      id
+      shelterEquipment {
+        ...shelter_equipment_details
+      }
+      cycleStorageEquipment {
+        cycleStorageType
+      }
     }
   }
-  ${StopTableRowFragmentDoc}
+  ${ShelterEquipmentDetailsFragmentDoc}
 `;
 export const StopAreaDetailsFragmentDoc = gql`
-  fragment StopAreaDetails on stop_registry_GroupOfStopPlaces {
+  fragment StopAreaDetails on stop_registry_StopPlace {
     id
-    geometry {
-      type
-      coordinates
-    }
-    description {
-      lang
+    alternativeNames {
+      name {
+        lang
+        value
+      }
+      nameType
+    }
+    privateCode {
       value
+      type
     }
     name {
       lang
       value
     }
-    validBetween {
-      fromDate
-      toDate
+    organisations {
+      relationshipType
+      organisationRef
+      organisation {
+        ...stop_place_organisation_fields
+      }
     }
-    members {
-      ...StopAreaDetailsMembers
+    geometry {
+      type
+      coordinates
+    }
+    keyValues {
+      key
+      values
+    }
+    weighting
+    submode
+    quays {
+      ...quay_details
     }
   }
-  ${StopAreaDetailsMembersFragmentDoc}
+  ${StopPlaceOrganisationFieldsFragmentDoc}
+  ${QuayDetailsFragmentDoc}
 `;
 export const InfraLinkMatchingFieldsFragmentDoc = gql`
   fragment infra_link_matching_fields on infrastructure_network_infrastructure_link {
@@ -75913,47 +75727,6 @@ export const FareZoneDetailsFragmentDoc = gql`
     }
   }
 `;
-export const ShelterEquipmentDetailsFragmentDoc = gql`
-  fragment shelter_equipment_details on stop_registry_ShelterEquipment {
-    id
-    enclosed
-    stepFree
-    shelterType
-    shelterElectricity
-    shelterLighting
-    shelterCondition
-    timetableCabinets
-    trashCan
-    shelterHasDisplay
-    bicycleParking
-    leaningRail
-    outsideBench
-    shelterFasciaBoardTaping
-  }
-`;
-export const QuayDetailsFragmentDoc = gql`
-  fragment quay_details on stop_registry_Quay {
-    id
-    publicCode
-    alternativeNames {
-      name {
-        lang
-        value
-      }
-      nameType
-    }
-    placeEquipments {
-      id
-      shelterEquipment {
-        ...shelter_equipment_details
-      }
-      cycleStorageEquipment {
-        cycleStorageType
-      }
-    }
-  }
-  ${ShelterEquipmentDetailsFragmentDoc}
-`;
 export const HslAccessibilityPropertiesDetailsFragmentDoc = gql`
   fragment hsl_accessibility_properties_details on stop_registry_HslAccessibilityProperties {
     id
@@ -75984,16 +75757,47 @@ export const HslAccessibilityPropertiesDetailsFragmentDoc = gql`
     accessibilityLevel
   }
 `;
-export const StopPlaceOrganisationFieldsFragmentDoc = gql`
-  fragment stop_place_organisation_fields on stop_registry_Organisation {
+export const StopPlaceDetailsFragmentDoc = gql`
+  fragment stop_place_details on stop_registry_StopPlace {
     id
-    name
-    privateContactDetails {
-      id
-      email
-      phone
+    alternativeNames {
+      name {
+        lang
+        value
+      }
+      nameType
+    }
+    privateCode {
+      value
+      type
+    }
+    name {
+      lang
+      value
+    }
+    organisations {
+      relationshipType
+      organisationRef
+      organisation {
+        ...stop_place_organisation_fields
+      }
+    }
+    geometry {
+      type
+      coordinates
+    }
+    keyValues {
+      key
+      values
+    }
+    weighting
+    submode
+    quays {
+      ...quay_details
     }
   }
+  ${StopPlaceOrganisationFieldsFragmentDoc}
+  ${QuayDetailsFragmentDoc}
 `;
 export const InfoSpotDetailsFragmentDoc = gql`
   fragment info_spot_details on stop_registry_infoSpot {
@@ -76021,113 +75825,6 @@ export const InfoSpotDetailsFragmentDoc = gql`
     }
   }
 `;
-export const StopPlaceDetailsFragmentDoc = gql`
-  fragment stop_place_details on stop_registry_StopPlace {
-    id
-    name {
-      lang
-      value
-    }
-    description {
-      lang
-      value
-    }
-    shortName {
-      lang
-      value
-    }
-    alternativeNames {
-      name {
-        lang
-        value
-      }
-      nameType
-    }
-    keyValues {
-      key
-      values
-    }
-    transportMode
-    stopPlaceType
-    weighting
-    submode
-    publicCode
-    privateCode {
-      value
-      type
-    }
-    geometry {
-      coordinates
-      type
-    }
-    topographicPlace {
-      ...topographic_place_details
-    }
-    fareZones {
-      ...fare_zone_details
-    }
-    placeEquipments {
-      generalSign {
-        privateCode {
-          value
-          type
-        }
-        signContentType
-        numberOfFrames
-        lineSignage
-        mainLineSign
-        replacesRailSign
-        note {
-          lang
-          value
-        }
-      }
-    }
-    quays {
-      ...quay_details
-    }
-    accessibilityAssessment {
-      id
-      hslAccessibilityProperties {
-        ...hsl_accessibility_properties_details
-      }
-      limitations {
-        id
-        version
-        audibleSignalsAvailable
-        escalatorFreeAccess
-        liftFreeAccess
-        stepFreeAccess
-        wheelchairAccess
-      }
-    }
-    organisations {
-      relationshipType
-      organisationRef
-      organisation {
-        ...stop_place_organisation_fields
-      }
-    }
-    infoSpots {
-      ...info_spot_details
-    }
-    groups {
-      id
-    }
-    adjacentSites {
-      ref
-    }
-    tariffZones {
-      id
-    }
-  }
-  ${TopographicPlaceDetailsFragmentDoc}
-  ${FareZoneDetailsFragmentDoc}
-  ${QuayDetailsFragmentDoc}
-  ${HslAccessibilityPropertiesDetailsFragmentDoc}
-  ${StopPlaceOrganisationFieldsFragmentDoc}
-  ${InfoSpotDetailsFragmentDoc}
-`;
 export const VehicleJourneyWithPatternAndRouteFragmentFragmentDoc = gql`
   fragment vehicle_journey_with_pattern_and_route_fragment on timetables_vehicle_journey_vehicle_journey {
     vehicle_journey_id
@@ -76495,17 +76192,12 @@ export function useFindStopPlacesByQueryAndGroupLazyQuery(
   >(FindStopPlacesByQueryAndGroupDocument, options);
 }
 export function useFindStopPlacesByQueryAndGroupSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        FindStopPlacesByQueryAndGroupQuery,
-        FindStopPlacesByQueryAndGroupQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    FindStopPlacesByQueryAndGroupQuery,
+    FindStopPlacesByQueryAndGroupQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     FindStopPlacesByQueryAndGroupQuery,
     FindStopPlacesByQueryAndGroupQueryVariables
@@ -76586,17 +76278,12 @@ export function useResolveMemberStopNamesLazyQuery(
   >(ResolveMemberStopNamesDocument, options);
 }
 export function useResolveMemberStopNamesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        ResolveMemberStopNamesQuery,
-        ResolveMemberStopNamesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    ResolveMemberStopNamesQuery,
+    ResolveMemberStopNamesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ResolveMemberStopNamesQuery,
     ResolveMemberStopNamesQueryVariables
@@ -76673,17 +76360,12 @@ export function useResolveStopAreaNamesLazyQuery(
   >(ResolveStopAreaNamesDocument, options);
 }
 export function useResolveStopAreaNamesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        ResolveStopAreaNamesQuery,
-        ResolveStopAreaNamesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    ResolveStopAreaNamesQuery,
+    ResolveStopAreaNamesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ResolveStopAreaNamesQuery,
     ResolveStopAreaNamesQueryVariables
@@ -76773,17 +76455,12 @@ export function useResolveStopAreaAndMemberStopNamesLazyQuery(
   >(ResolveStopAreaAndMemberStopNamesDocument, options);
 }
 export function useResolveStopAreaAndMemberStopNamesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        ResolveStopAreaAndMemberStopNamesQuery,
-        ResolveStopAreaAndMemberStopNamesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    ResolveStopAreaAndMemberStopNamesQuery,
+    ResolveStopAreaAndMemberStopNamesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ResolveStopAreaAndMemberStopNamesQuery,
     ResolveStopAreaAndMemberStopNamesQueryVariables
@@ -76906,17 +76583,12 @@ export function useListChangingRoutesLazyQuery(
   >(ListChangingRoutesDocument, options);
 }
 export function useListChangingRoutesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        ListChangingRoutesQuery,
-        ListChangingRoutesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    ListChangingRoutesQuery,
+    ListChangingRoutesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ListChangingRoutesQuery,
     ListChangingRoutesQueryVariables
@@ -76988,17 +76660,12 @@ export function useListOwnLinesLazyQuery(
   );
 }
 export function useListOwnLinesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        ListOwnLinesQuery,
-        ListOwnLinesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    ListOwnLinesQuery,
+    ListOwnLinesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<ListOwnLinesQuery, ListOwnLinesQueryVariables>(
     ListOwnLinesDocument,
     options,
@@ -77086,17 +76753,12 @@ export function useGetScheduledStopPointWithTimingSettingsLazyQuery(
   >(GetScheduledStopPointWithTimingSettingsDocument, options);
 }
 export function useGetScheduledStopPointWithTimingSettingsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetScheduledStopPointWithTimingSettingsQuery,
-        GetScheduledStopPointWithTimingSettingsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetScheduledStopPointWithTimingSettingsQuery,
+    GetScheduledStopPointWithTimingSettingsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetScheduledStopPointWithTimingSettingsQuery,
     GetScheduledStopPointWithTimingSettingsQueryVariables
@@ -77191,17 +76853,12 @@ export function useDoesStopHaveNextValidAlternativeLazyQuery(
   >(DoesStopHaveNextValidAlternativeDocument, options);
 }
 export function useDoesStopHaveNextValidAlternativeSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        DoesStopHaveNextValidAlternativeQuery,
-        DoesStopHaveNextValidAlternativeQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    DoesStopHaveNextValidAlternativeQuery,
+    DoesStopHaveNextValidAlternativeQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     DoesStopHaveNextValidAlternativeQuery,
     DoesStopHaveNextValidAlternativeQueryVariables
@@ -77285,17 +76942,12 @@ export function useFindLinesByStopSearchLazyQuery(
   >(FindLinesByStopSearchDocument, options);
 }
 export function useFindLinesByStopSearchSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        FindLinesByStopSearchQuery,
-        FindLinesByStopSearchQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    FindLinesByStopSearchQuery,
+    FindLinesByStopSearchQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     FindLinesByStopSearchQuery,
     FindLinesByStopSearchQueryVariables
@@ -77379,17 +77031,12 @@ export function useGetStopsByRouteIdLazyQuery(
   >(GetStopsByRouteIdDocument, options);
 }
 export function useGetStopsByRouteIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopsByRouteIdQuery,
-        GetStopsByRouteIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopsByRouteIdQuery,
+    GetStopsByRouteIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopsByRouteIdQuery,
     GetStopsByRouteIdQueryVariables
@@ -77472,17 +77119,12 @@ export function useResolveStopPlaceNetextIdsByLineIdsLazyQuery(
   >(ResolveStopPlaceNetextIdsByLineIdsDocument, options);
 }
 export function useResolveStopPlaceNetextIdsByLineIdsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        ResolveStopPlaceNetextIdsByLineIdsQuery,
-        ResolveStopPlaceNetextIdsByLineIdsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    ResolveStopPlaceNetextIdsByLineIdsQuery,
+    ResolveStopPlaceNetextIdsByLineIdsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ResolveStopPlaceNetextIdsByLineIdsQuery,
     ResolveStopPlaceNetextIdsByLineIdsQueryVariables
@@ -77582,17 +77224,12 @@ export function useFindStopAreasLazyQuery(
   );
 }
 export function useFindStopAreasSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        FindStopAreasQuery,
-        FindStopAreasQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    FindStopAreasQuery,
+    FindStopAreasQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     FindStopAreasQuery,
     FindStopAreasQueryVariables
@@ -77670,17 +77307,12 @@ export function useGetStopsByStopAreaIdLazyQuery(
   >(GetStopsByStopAreaIdDocument, options);
 }
 export function useGetStopsByStopAreaIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopsByStopAreaIdQuery,
-        GetStopsByStopAreaIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopsByStopAreaIdQuery,
+    GetStopsByStopAreaIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopsByStopAreaIdQuery,
     GetStopsByStopAreaIdQueryVariables
@@ -77773,17 +77405,12 @@ export function useSearchStopsLazyQuery(
   );
 }
 export function useSearchStopsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        SearchStopsQuery,
-        SearchStopsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    SearchStopsQuery,
+    SearchStopsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<SearchStopsQuery, SearchStopsQueryVariables>(
     SearchStopsDocument,
     options,
@@ -77803,7 +77430,7 @@ export type SearchStopsQueryResult = Apollo.QueryResult<
 export const GetStopAreaDetailsDocument = gql`
   query getStopAreaDetails($id: String!) {
     stop_registry {
-      groupOfStopPlaces(id: $id) {
+      stopPlace(id: $id) {
         ...StopAreaDetails
       }
     }
@@ -77856,17 +77483,12 @@ export function useGetStopAreaDetailsLazyQuery(
   >(GetStopAreaDetailsDocument, options);
 }
 export function useGetStopAreaDetailsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopAreaDetailsQuery,
-        GetStopAreaDetailsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopAreaDetailsQuery,
+    GetStopAreaDetailsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopAreaDetailsQuery,
     GetStopAreaDetailsQueryVariables
@@ -77939,17 +77561,12 @@ export function useFindExistingPosterNamesLazyQuery(
   >(FindExistingPosterNamesDocument, options);
 }
 export function useFindExistingPosterNamesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        FindExistingPosterNamesQuery,
-        FindExistingPosterNamesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    FindExistingPosterNamesQuery,
+    FindExistingPosterNamesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     FindExistingPosterNamesQuery,
     FindExistingPosterNamesQueryVariables
@@ -78019,17 +77636,12 @@ export function useGetOrganisationsLazyQuery(
   >(GetOrganisationsDocument, options);
 }
 export function useGetOrganisationsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetOrganisationsQuery,
-        GetOrganisationsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetOrganisationsQuery,
+    GetOrganisationsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetOrganisationsQuery,
     GetOrganisationsQueryVariables
@@ -78165,17 +77777,12 @@ export function useResolveStopSheltersLazyQuery(
   >(ResolveStopSheltersDocument, options);
 }
 export function useResolveStopSheltersSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        ResolveStopSheltersQuery,
-        ResolveStopSheltersQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    ResolveStopSheltersQuery,
+    ResolveStopSheltersQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ResolveStopSheltersQuery,
     ResolveStopSheltersQueryVariables
@@ -78263,17 +77870,12 @@ export function useResolveExistingStopValidityRangesLazyQuery(
   >(ResolveExistingStopValidityRangesDocument, options);
 }
 export function useResolveExistingStopValidityRangesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        ResolveExistingStopValidityRangesQuery,
-        ResolveExistingStopValidityRangesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    ResolveExistingStopValidityRangesQuery,
+    ResolveExistingStopValidityRangesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     ResolveExistingStopValidityRangesQuery,
     ResolveExistingStopValidityRangesQueryVariables
@@ -78345,17 +77947,12 @@ export function useGetRouteWithJourneyPatternLazyQuery(
   >(GetRouteWithJourneyPatternDocument, options);
 }
 export function useGetRouteWithJourneyPatternSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRouteWithJourneyPatternQuery,
-        GetRouteWithJourneyPatternQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRouteWithJourneyPatternQuery,
+    GetRouteWithJourneyPatternQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRouteWithJourneyPatternQuery,
     GetRouteWithJourneyPatternQueryVariables
@@ -78426,17 +78023,12 @@ export function useQueryClosestLinkLazyQuery(
   >(QueryClosestLinkDocument, options);
 }
 export function useQueryClosestLinkSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        QueryClosestLinkQuery,
-        QueryClosestLinkQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    QueryClosestLinkQuery,
+    QueryClosestLinkQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     QueryClosestLinkQuery,
     QueryClosestLinkQueryVariables
@@ -78516,17 +78108,12 @@ export function useQueryPointDirectionOnLinkLazyQuery(
   >(QueryPointDirectionOnLinkDocument, options);
 }
 export function useQueryPointDirectionOnLinkSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        QueryPointDirectionOnLinkQuery,
-        QueryPointDirectionOnLinkQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    QueryPointDirectionOnLinkQuery,
+    QueryPointDirectionOnLinkQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     QueryPointDirectionOnLinkQuery,
     QueryPointDirectionOnLinkQueryVariables
@@ -78599,17 +78186,12 @@ export function useGetStopsAlongInfrastructureLinksLazyQuery(
   >(GetStopsAlongInfrastructureLinksDocument, options);
 }
 export function useGetStopsAlongInfrastructureLinksSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopsAlongInfrastructureLinksQuery,
-        GetStopsAlongInfrastructureLinksQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopsAlongInfrastructureLinksQuery,
+    GetStopsAlongInfrastructureLinksQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopsAlongInfrastructureLinksQuery,
     GetStopsAlongInfrastructureLinksQueryVariables
@@ -78834,17 +78416,12 @@ export function useGetScheduledStopPointWithViaInfoLazyQuery(
   >(GetScheduledStopPointWithViaInfoDocument, options);
 }
 export function useGetScheduledStopPointWithViaInfoSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetScheduledStopPointWithViaInfoQuery,
-        GetScheduledStopPointWithViaInfoQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetScheduledStopPointWithViaInfoQuery,
+    GetScheduledStopPointWithViaInfoQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetScheduledStopPointWithViaInfoQuery,
     GetScheduledStopPointWithViaInfoQueryVariables
@@ -78916,17 +78493,12 @@ export function useGetLineDetailsByIdLazyQuery(
   >(GetLineDetailsByIdDocument, options);
 }
 export function useGetLineDetailsByIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetLineDetailsByIdQuery,
-        GetLineDetailsByIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetLineDetailsByIdQuery,
+    GetLineDetailsByIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetLineDetailsByIdQuery,
     GetLineDetailsByIdQueryVariables
@@ -79000,17 +78572,12 @@ export function useGetLineValidityPeriodByIdLazyQuery(
   >(GetLineValidityPeriodByIdDocument, options);
 }
 export function useGetLineValidityPeriodByIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetLineValidityPeriodByIdQuery,
-        GetLineValidityPeriodByIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetLineValidityPeriodByIdQuery,
+    GetLineValidityPeriodByIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetLineValidityPeriodByIdQuery,
     GetLineValidityPeriodByIdQueryVariables
@@ -79079,17 +78646,12 @@ export function useGetLinesByValidityLazyQuery(
   >(GetLinesByValidityDocument, options);
 }
 export function useGetLinesByValiditySuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetLinesByValidityQuery,
-        GetLinesByValidityQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetLinesByValidityQuery,
+    GetLinesByValidityQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetLinesByValidityQuery,
     GetLinesByValidityQueryVariables
@@ -79194,17 +78756,12 @@ export function useGetLineDetailsWithRoutesByIdLazyQuery(
   >(GetLineDetailsWithRoutesByIdDocument, options);
 }
 export function useGetLineDetailsWithRoutesByIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetLineDetailsWithRoutesByIdQuery,
-        GetLineDetailsWithRoutesByIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetLineDetailsWithRoutesByIdQuery,
+    GetLineDetailsWithRoutesByIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetLineDetailsWithRoutesByIdQuery,
     GetLineDetailsWithRoutesByIdQueryVariables
@@ -79273,17 +78830,12 @@ export function useGetRoutesWithStopsLazyQuery(
   >(GetRoutesWithStopsDocument, options);
 }
 export function useGetRoutesWithStopsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRoutesWithStopsQuery,
-        GetRoutesWithStopsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRoutesWithStopsQuery,
+    GetRoutesWithStopsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRoutesWithStopsQuery,
     GetRoutesWithStopsQueryVariables
@@ -79356,17 +78908,12 @@ export function useGetRouteDetailsByIdLazyQuery(
   >(GetRouteDetailsByIdDocument, options);
 }
 export function useGetRouteDetailsByIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRouteDetailsByIdQuery,
-        GetRouteDetailsByIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRouteDetailsByIdQuery,
+    GetRouteDetailsByIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRouteDetailsByIdQuery,
     GetRouteDetailsByIdQueryVariables
@@ -79435,17 +78982,12 @@ export function useGetRouteDetailsByIdsLazyQuery(
   >(GetRouteDetailsByIdsDocument, options);
 }
 export function useGetRouteDetailsByIdsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRouteDetailsByIdsQuery,
-        GetRouteDetailsByIdsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRouteDetailsByIdsQuery,
+    GetRouteDetailsByIdsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRouteDetailsByIdsQuery,
     GetRouteDetailsByIdsQueryVariables
@@ -79522,17 +79064,12 @@ export function useGetRouteRenderInfoByIdLazyQuery(
   >(GetRouteRenderInfoByIdDocument, options);
 }
 export function useGetRouteRenderInfoByIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRouteRenderInfoByIdQuery,
-        GetRouteRenderInfoByIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRouteRenderInfoByIdQuery,
+    GetRouteRenderInfoByIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRouteRenderInfoByIdQuery,
     GetRouteRenderInfoByIdQueryVariables
@@ -79616,17 +79153,12 @@ export function useGetRouteDetailsByLabelsLazyQuery(
   >(GetRouteDetailsByLabelsDocument, options);
 }
 export function useGetRouteDetailsByLabelsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRouteDetailsByLabelsQuery,
-        GetRouteDetailsByLabelsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRouteDetailsByLabelsQuery,
+    GetRouteDetailsByLabelsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRouteDetailsByLabelsQuery,
     GetRouteDetailsByLabelsQueryVariables
@@ -79695,17 +79227,12 @@ export function useGetRoutesWithInfrastructureLinksLazyQuery(
   >(GetRoutesWithInfrastructureLinksDocument, options);
 }
 export function useGetRoutesWithInfrastructureLinksSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRoutesWithInfrastructureLinksQuery,
-        GetRoutesWithInfrastructureLinksQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRoutesWithInfrastructureLinksQuery,
+    GetRoutesWithInfrastructureLinksQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRoutesWithInfrastructureLinksQuery,
     GetRoutesWithInfrastructureLinksQueryVariables
@@ -79773,17 +79300,12 @@ export function useGetRoutesByValidityLazyQuery(
   >(GetRoutesByValidityDocument, options);
 }
 export function useGetRoutesByValiditySuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRoutesByValidityQuery,
-        GetRoutesByValidityQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRoutesByValidityQuery,
+    GetRoutesByValidityQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRoutesByValidityQuery,
     GetRoutesByValidityQueryVariables
@@ -80127,17 +79649,12 @@ export function useGetScheduledStopsOnRouteLazyQuery(
   >(GetScheduledStopsOnRouteDocument, options);
 }
 export function useGetScheduledStopsOnRouteSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetScheduledStopsOnRouteQuery,
-        GetScheduledStopsOnRouteQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetScheduledStopsOnRouteQuery,
+    GetScheduledStopsOnRouteQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetScheduledStopsOnRouteQuery,
     GetScheduledStopsOnRouteQueryVariables
@@ -80270,17 +79787,12 @@ export function useGetStopsByLocationLazyQuery(
   >(GetStopsByLocationDocument, options);
 }
 export function useGetStopsByLocationSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopsByLocationQuery,
-        GetStopsByLocationQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopsByLocationQuery,
+    GetStopsByLocationQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopsByLocationQuery,
     GetStopsByLocationQueryVariables
@@ -80351,17 +79863,12 @@ export function useGetStopsByValidityLazyQuery(
   >(GetStopsByValidityDocument, options);
 }
 export function useGetStopsByValiditySuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopsByValidityQuery,
-        GetStopsByValidityQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopsByValidityQuery,
+    GetStopsByValidityQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopsByValidityQuery,
     GetStopsByValidityQueryVariables
@@ -80432,17 +79939,12 @@ export function useGetStopsByIdsLazyQuery(
   );
 }
 export function useGetStopsByIdsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopsByIdsQuery,
-        GetStopsByIdsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopsByIdsQuery,
+    GetStopsByIdsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopsByIdsQuery,
     GetStopsByIdsQueryVariables
@@ -80513,17 +80015,12 @@ export function useGetStopsByLabelsLazyQuery(
   >(GetStopsByLabelsDocument, options);
 }
 export function useGetStopsByLabelsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopsByLabelsQuery,
-        GetStopsByLabelsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopsByLabelsQuery,
+    GetStopsByLabelsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopsByLabelsQuery,
     GetStopsByLabelsQueryVariables
@@ -80625,17 +80122,12 @@ export function useGetStopWithRouteGraphDataByIdLazyQuery(
   >(GetStopWithRouteGraphDataByIdDocument, options);
 }
 export function useGetStopWithRouteGraphDataByIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopWithRouteGraphDataByIdQuery,
-        GetStopWithRouteGraphDataByIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopWithRouteGraphDataByIdQuery,
+    GetStopWithRouteGraphDataByIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopWithRouteGraphDataByIdQuery,
     GetStopWithRouteGraphDataByIdQueryVariables
@@ -80713,17 +80205,12 @@ export function useGetStopAreasByLocationLazyQuery(
   >(GetStopAreasByLocationDocument, options);
 }
 export function useGetStopAreasByLocationSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopAreasByLocationQuery,
-        GetStopAreasByLocationQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopAreasByLocationQuery,
+    GetStopAreasByLocationQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopAreasByLocationQuery,
     GetStopAreasByLocationQueryVariables
@@ -80802,17 +80289,12 @@ export function useGetScheduledStopPointByStopPlaceRefLazyQuery(
   >(GetScheduledStopPointByStopPlaceRefDocument, options);
 }
 export function useGetScheduledStopPointByStopPlaceRefSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetScheduledStopPointByStopPlaceRefQuery,
-        GetScheduledStopPointByStopPlaceRefQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetScheduledStopPointByStopPlaceRefQuery,
+    GetScheduledStopPointByStopPlaceRefQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetScheduledStopPointByStopPlaceRefQuery,
     GetScheduledStopPointByStopPlaceRefQueryVariables
@@ -80886,17 +80368,12 @@ export function useGetHighestPriorityLineDetailsWithRoutesLazyQuery(
   >(GetHighestPriorityLineDetailsWithRoutesDocument, options);
 }
 export function useGetHighestPriorityLineDetailsWithRoutesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetHighestPriorityLineDetailsWithRoutesQuery,
-        GetHighestPriorityLineDetailsWithRoutesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetHighestPriorityLineDetailsWithRoutesQuery,
+    GetHighestPriorityLineDetailsWithRoutesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetHighestPriorityLineDetailsWithRoutesQuery,
     GetHighestPriorityLineDetailsWithRoutesQueryVariables
@@ -81132,17 +80609,12 @@ export function useGetLinksWithStopsByExternalLinkIdsLazyQuery(
   >(GetLinksWithStopsByExternalLinkIdsDocument, options);
 }
 export function useGetLinksWithStopsByExternalLinkIdsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetLinksWithStopsByExternalLinkIdsQuery,
-        GetLinksWithStopsByExternalLinkIdsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetLinksWithStopsByExternalLinkIdsQuery,
+    GetLinksWithStopsByExternalLinkIdsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetLinksWithStopsByExternalLinkIdsQuery,
     GetLinksWithStopsByExternalLinkIdsQueryVariables
@@ -81217,17 +80689,12 @@ export function useGetLineRoutesByLabelLazyQuery(
   >(GetLineRoutesByLabelDocument, options);
 }
 export function useGetLineRoutesByLabelSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetLineRoutesByLabelQuery,
-        GetLineRoutesByLabelQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetLineRoutesByLabelQuery,
+    GetLineRoutesByLabelQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetLineRoutesByLabelQuery,
     GetLineRoutesByLabelQueryVariables
@@ -81296,17 +80763,12 @@ export function useGetRouteByFiltersLazyQuery(
   >(GetRouteByFiltersDocument, options);
 }
 export function useGetRouteByFiltersSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRouteByFiltersQuery,
-        GetRouteByFiltersQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRouteByFiltersQuery,
+    GetRouteByFiltersQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRouteByFiltersQuery,
     GetRouteByFiltersQueryVariables
@@ -81382,17 +80844,12 @@ export function useGetRouteWithInfrastructureLinksWithStopsLazyQuery(
   >(GetRouteWithInfrastructureLinksWithStopsDocument, options);
 }
 export function useGetRouteWithInfrastructureLinksWithStopsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRouteWithInfrastructureLinksWithStopsQuery,
-        GetRouteWithInfrastructureLinksWithStopsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRouteWithInfrastructureLinksWithStopsQuery,
+    GetRouteWithInfrastructureLinksWithStopsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRouteWithInfrastructureLinksWithStopsQuery,
     GetRouteWithInfrastructureLinksWithStopsQueryVariables
@@ -81471,17 +80928,12 @@ export function useSearchLinesAndRoutesLazyQuery(
   >(SearchLinesAndRoutesDocument, options);
 }
 export function useSearchLinesAndRoutesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        SearchLinesAndRoutesQuery,
-        SearchLinesAndRoutesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    SearchLinesAndRoutesQuery,
+    SearchLinesAndRoutesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     SearchLinesAndRoutesQuery,
     SearchLinesAndRoutesQueryVariables
@@ -81606,17 +81058,12 @@ export function useGetStopAreaByIdLazyQuery(
   >(GetStopAreaByIdDocument, options);
 }
 export function useGetStopAreaByIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStopAreaByIdQuery,
-        GetStopAreaByIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopAreaByIdQuery,
+    GetStopAreaByIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStopAreaByIdQuery,
     GetStopAreaByIdQueryVariables
@@ -81891,17 +81338,12 @@ export function useGetHighestPriorityStopDetailsByLabelAndDateLazyQuery(
   >(GetHighestPriorityStopDetailsByLabelAndDateDocument, options);
 }
 export function useGetHighestPriorityStopDetailsByLabelAndDateSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetHighestPriorityStopDetailsByLabelAndDateQuery,
-        GetHighestPriorityStopDetailsByLabelAndDateQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetHighestPriorityStopDetailsByLabelAndDateQuery,
+    GetHighestPriorityStopDetailsByLabelAndDateQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetHighestPriorityStopDetailsByLabelAndDateQuery,
     GetHighestPriorityStopDetailsByLabelAndDateQueryVariables
@@ -81920,6 +81362,86 @@ export type GetHighestPriorityStopDetailsByLabelAndDateQueryResult =
     GetHighestPriorityStopDetailsByLabelAndDateQuery,
     GetHighestPriorityStopDetailsByLabelAndDateQueryVariables
   >;
+export const GetStopPlaceDetailsDocument = gql`
+  query getStopPlaceDetails($id: String!) {
+    stop_registry {
+      stopPlace(id: $id) {
+        ...stop_place_details
+      }
+    }
+  }
+  ${StopPlaceDetailsFragmentDoc}
+`;
+
+/**
+ * __useGetStopPlaceDetailsQuery__
+ *
+ * To run a query within a React component, call `useGetStopPlaceDetailsQuery` and pass it any options that fit your needs.
+ * When your component renders, `useGetStopPlaceDetailsQuery` returns an object from Apollo Client that contains loading, error, and data properties
+ * you can use to render your UI.
+ *
+ * @param baseOptions options that will be passed into the query, supported options are listed on: https://www.apollographql.com/docs/react/api/react-hooks/#options;
+ *
+ * @example
+ * const { data, loading, error } = useGetStopPlaceDetailsQuery({
+ *   variables: {
+ *      id: // value for 'id'
+ *   },
+ * });
+ */
+export function useGetStopPlaceDetailsQuery(
+  baseOptions: Apollo.QueryHookOptions<
+    GetStopPlaceDetailsQuery,
+    GetStopPlaceDetailsQueryVariables
+  > &
+    (
+      | { variables: GetStopPlaceDetailsQueryVariables; skip?: boolean }
+      | { skip: boolean }
+    ),
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useQuery<
+    GetStopPlaceDetailsQuery,
+    GetStopPlaceDetailsQueryVariables
+  >(GetStopPlaceDetailsDocument, options);
+}
+export function useGetStopPlaceDetailsLazyQuery(
+  baseOptions?: Apollo.LazyQueryHookOptions<
+    GetStopPlaceDetailsQuery,
+    GetStopPlaceDetailsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useLazyQuery<
+    GetStopPlaceDetailsQuery,
+    GetStopPlaceDetailsQueryVariables
+  >(GetStopPlaceDetailsDocument, options);
+}
+export function useGetStopPlaceDetailsSuspenseQuery(
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStopPlaceDetailsQuery,
+    GetStopPlaceDetailsQueryVariables
+  >,
+) {
+  const options = { ...defaultOptions, ...baseOptions };
+  return Apollo.useSuspenseQuery<
+    GetStopPlaceDetailsQuery,
+    GetStopPlaceDetailsQueryVariables
+  >(GetStopPlaceDetailsDocument, options);
+}
+export type GetStopPlaceDetailsQueryHookResult = ReturnType<
+  typeof useGetStopPlaceDetailsQuery
+>;
+export type GetStopPlaceDetailsLazyQueryHookResult = ReturnType<
+  typeof useGetStopPlaceDetailsLazyQuery
+>;
+export type GetStopPlaceDetailsSuspenseQueryHookResult = ReturnType<
+  typeof useGetStopPlaceDetailsSuspenseQuery
+>;
+export type GetStopPlaceDetailsQueryResult = Apollo.QueryResult<
+  GetStopPlaceDetailsQuery,
+  GetStopPlaceDetailsQueryVariables
+>;
 export const UpsertOrganisationDocument = gql`
   mutation UpsertOrganisation($objects: [stop_registry_OrganisationInput]) {
     stop_registry {
@@ -82260,17 +81782,12 @@ export function useGetRoutesBrokenByStopChangeLazyQuery(
   >(GetRoutesBrokenByStopChangeDocument, options);
 }
 export function useGetRoutesBrokenByStopChangeSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRoutesBrokenByStopChangeQuery,
-        GetRoutesBrokenByStopChangeQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRoutesBrokenByStopChangeQuery,
+    GetRoutesBrokenByStopChangeQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRoutesBrokenByStopChangeQuery,
     GetRoutesBrokenByStopChangeQueryVariables
@@ -82500,17 +82017,12 @@ export function useGetScheduledStopPointsInJourneyPatternsUsedAsTimingPointsLazy
   >(GetScheduledStopPointsInJourneyPatternsUsedAsTimingPointsDocument, options);
 }
 export function useGetScheduledStopPointsInJourneyPatternsUsedAsTimingPointsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetScheduledStopPointsInJourneyPatternsUsedAsTimingPointsQuery,
-        GetScheduledStopPointsInJourneyPatternsUsedAsTimingPointsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetScheduledStopPointsInJourneyPatternsUsedAsTimingPointsQuery,
+    GetScheduledStopPointsInJourneyPatternsUsedAsTimingPointsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetScheduledStopPointsInJourneyPatternsUsedAsTimingPointsQuery,
     GetScheduledStopPointsInJourneyPatternsUsedAsTimingPointsQueryVariables
@@ -82797,17 +82309,12 @@ export function useGetSubstituteOperatingPeriodsLazyQuery(
   >(GetSubstituteOperatingPeriodsDocument, options);
 }
 export function useGetSubstituteOperatingPeriodsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetSubstituteOperatingPeriodsQuery,
-        GetSubstituteOperatingPeriodsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetSubstituteOperatingPeriodsQuery,
+    GetSubstituteOperatingPeriodsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetSubstituteOperatingPeriodsQuery,
     GetSubstituteOperatingPeriodsQueryVariables
@@ -82884,17 +82391,12 @@ export function useGetToCombineTargetVehicleScheduleFrameIdLazyQuery(
   >(GetToCombineTargetVehicleScheduleFrameIdDocument, options);
 }
 export function useGetToCombineTargetVehicleScheduleFrameIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetToCombineTargetVehicleScheduleFrameIdQuery,
-        GetToCombineTargetVehicleScheduleFrameIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetToCombineTargetVehicleScheduleFrameIdQuery,
+    GetToCombineTargetVehicleScheduleFrameIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetToCombineTargetVehicleScheduleFrameIdQuery,
     GetToCombineTargetVehicleScheduleFrameIdQueryVariables
@@ -82969,17 +82471,12 @@ export function useGetToReplaceVehicleScheduleFramesLazyQuery(
   >(GetToReplaceVehicleScheduleFramesDocument, options);
 }
 export function useGetToReplaceVehicleScheduleFramesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetToReplaceVehicleScheduleFramesQuery,
-        GetToReplaceVehicleScheduleFramesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetToReplaceVehicleScheduleFramesQuery,
+    GetToReplaceVehicleScheduleFramesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetToReplaceVehicleScheduleFramesQuery,
     GetToReplaceVehicleScheduleFramesQueryVariables
@@ -83078,17 +82575,12 @@ export function useGetVehicleScheduleFrameWithJourneyInfoLazyQuery(
   >(GetVehicleScheduleFrameWithJourneyInfoDocument, options);
 }
 export function useGetVehicleScheduleFrameWithJourneyInfoSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetVehicleScheduleFrameWithJourneyInfoQuery,
-        GetVehicleScheduleFrameWithJourneyInfoQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetVehicleScheduleFrameWithJourneyInfoQuery,
+    GetVehicleScheduleFrameWithJourneyInfoQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetVehicleScheduleFrameWithJourneyInfoQuery,
     GetVehicleScheduleFrameWithJourneyInfoQueryVariables
@@ -83189,17 +82681,12 @@ export function useGetVehicleScheduleFrameWithRouteAndLineInfoLazyQuery(
   >(GetVehicleScheduleFrameWithRouteAndLineInfoDocument, options);
 }
 export function useGetVehicleScheduleFrameWithRouteAndLineInfoSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetVehicleScheduleFrameWithRouteAndLineInfoQuery,
-        GetVehicleScheduleFrameWithRouteAndLineInfoQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetVehicleScheduleFrameWithRouteAndLineInfoQuery,
+    GetVehicleScheduleFrameWithRouteAndLineInfoQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetVehicleScheduleFrameWithRouteAndLineInfoQuery,
     GetVehicleScheduleFrameWithRouteAndLineInfoQueryVariables
@@ -83271,17 +82758,12 @@ export function useGetStagingVehicleScheduleFramesLazyQuery(
   >(GetStagingVehicleScheduleFramesDocument, options);
 }
 export function useGetStagingVehicleScheduleFramesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetStagingVehicleScheduleFramesQuery,
-        GetStagingVehicleScheduleFramesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetStagingVehicleScheduleFramesQuery,
+    GetStagingVehicleScheduleFramesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetStagingVehicleScheduleFramesQuery,
     GetStagingVehicleScheduleFramesQueryVariables
@@ -83648,17 +83130,12 @@ export function useGetTimingPlacesByLabelLazyQuery(
   >(GetTimingPlacesByLabelDocument, options);
 }
 export function useGetTimingPlacesByLabelSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetTimingPlacesByLabelQuery,
-        GetTimingPlacesByLabelQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetTimingPlacesByLabelQuery,
+    GetTimingPlacesByLabelQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetTimingPlacesByLabelQuery,
     GetTimingPlacesByLabelQueryVariables
@@ -83742,17 +83219,12 @@ export function useGetLinesForComboboxLazyQuery(
   >(GetLinesForComboboxDocument, options);
 }
 export function useGetLinesForComboboxSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetLinesForComboboxQuery,
-        GetLinesForComboboxQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetLinesForComboboxQuery,
+    GetLinesForComboboxQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetLinesForComboboxQuery,
     GetLinesForComboboxQueryVariables
@@ -83825,17 +83297,12 @@ export function useGetSelectedLineDetailsByIdLazyQuery(
   >(GetSelectedLineDetailsByIdDocument, options);
 }
 export function useGetSelectedLineDetailsByIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetSelectedLineDetailsByIdQuery,
-        GetSelectedLineDetailsByIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetSelectedLineDetailsByIdQuery,
+    GetSelectedLineDetailsByIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetSelectedLineDetailsByIdQuery,
     GetSelectedLineDetailsByIdQueryVariables
@@ -83929,17 +83396,12 @@ export function useGetRouteDetailsByLabelWildcardLazyQuery(
   >(GetRouteDetailsByLabelWildcardDocument, options);
 }
 export function useGetRouteDetailsByLabelWildcardSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRouteDetailsByLabelWildcardQuery,
-        GetRouteDetailsByLabelWildcardQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRouteDetailsByLabelWildcardQuery,
+    GetRouteDetailsByLabelWildcardQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRouteDetailsByLabelWildcardQuery,
     GetRouteDetailsByLabelWildcardQueryVariables
@@ -84012,17 +83474,12 @@ export function useGetSelectedRouteDetailsByIdLazyQuery(
   >(GetSelectedRouteDetailsByIdDocument, options);
 }
 export function useGetSelectedRouteDetailsByIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetSelectedRouteDetailsByIdQuery,
-        GetSelectedRouteDetailsByIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetSelectedRouteDetailsByIdQuery,
+    GetSelectedRouteDetailsByIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetSelectedRouteDetailsByIdQuery,
     GetSelectedRouteDetailsByIdQueryVariables
@@ -84099,17 +83556,12 @@ export function useGetTimingPlacesForComboboxLazyQuery(
   >(GetTimingPlacesForComboboxDocument, options);
 }
 export function useGetTimingPlacesForComboboxSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetTimingPlacesForComboboxQuery,
-        GetTimingPlacesForComboboxQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetTimingPlacesForComboboxQuery,
+    GetTimingPlacesForComboboxQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetTimingPlacesForComboboxQuery,
     GetTimingPlacesForComboboxQueryVariables
@@ -84185,17 +83637,12 @@ export function useGetSelectedTimingPlaceDetailsByIdLazyQuery(
   >(GetSelectedTimingPlaceDetailsByIdDocument, options);
 }
 export function useGetSelectedTimingPlaceDetailsByIdSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetSelectedTimingPlaceDetailsByIdQuery,
-        GetSelectedTimingPlaceDetailsByIdQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetSelectedTimingPlaceDetailsByIdQuery,
+    GetSelectedTimingPlaceDetailsByIdQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetSelectedTimingPlaceDetailsByIdQuery,
     GetSelectedTimingPlaceDetailsByIdQueryVariables
@@ -84263,17 +83710,12 @@ export function useGetRouteInfoForTimetableVersionsLazyQuery(
   >(GetRouteInfoForTimetableVersionsDocument, options);
 }
 export function useGetRouteInfoForTimetableVersionsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetRouteInfoForTimetableVersionsQuery,
-        GetRouteInfoForTimetableVersionsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetRouteInfoForTimetableVersionsQuery,
+    GetRouteInfoForTimetableVersionsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetRouteInfoForTimetableVersionsQuery,
     GetRouteInfoForTimetableVersionsQueryVariables
@@ -84358,17 +83800,12 @@ export function useGetTimetableVersionsByJourneyPatternIdsLazyQuery(
   >(GetTimetableVersionsByJourneyPatternIdsDocument, options);
 }
 export function useGetTimetableVersionsByJourneyPatternIdsSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetTimetableVersionsByJourneyPatternIdsQuery,
-        GetTimetableVersionsByJourneyPatternIdsQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetTimetableVersionsByJourneyPatternIdsQuery,
+    GetTimetableVersionsByJourneyPatternIdsQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetTimetableVersionsByJourneyPatternIdsQuery,
     GetTimetableVersionsByJourneyPatternIdsQueryVariables
@@ -84520,17 +83957,12 @@ export function useGetVehicleScheduleFrameSchedulesLazyQuery(
   >(GetVehicleScheduleFrameSchedulesDocument, options);
 }
 export function useGetVehicleScheduleFrameSchedulesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetVehicleScheduleFrameSchedulesQuery,
-        GetVehicleScheduleFrameSchedulesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetVehicleScheduleFrameSchedulesQuery,
+    GetVehicleScheduleFrameSchedulesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetVehicleScheduleFrameSchedulesQuery,
     GetVehicleScheduleFrameSchedulesQueryVariables
@@ -84611,17 +84043,12 @@ export function useGetVehicleScheduleFrameWithRoutesLazyQuery(
   >(GetVehicleScheduleFrameWithRoutesDocument, options);
 }
 export function useGetVehicleScheduleFrameWithRoutesSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetVehicleScheduleFrameWithRoutesQuery,
-        GetVehicleScheduleFrameWithRoutesQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetVehicleScheduleFrameWithRoutesQuery,
+    GetVehicleScheduleFrameWithRoutesQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetVehicleScheduleFrameWithRoutesQuery,
     GetVehicleScheduleFrameWithRoutesQueryVariables
@@ -84778,17 +84205,12 @@ export function useGetVehicleSchedulesForDateLazyQuery(
   >(GetVehicleSchedulesForDateDocument, options);
 }
 export function useGetVehicleSchedulesForDateSuspenseQuery(
-  baseOptions?:
-    | Apollo.SkipToken
-    | Apollo.SuspenseQueryHookOptions<
-        GetVehicleSchedulesForDateQuery,
-        GetVehicleSchedulesForDateQueryVariables
-      >,
+  baseOptions?: Apollo.SuspenseQueryHookOptions<
+    GetVehicleSchedulesForDateQuery,
+    GetVehicleSchedulesForDateQueryVariables
+  >,
 ) {
-  const options =
-    baseOptions === Apollo.skipToken
-      ? baseOptions
-      : { ...defaultOptions, ...baseOptions };
+  const options = { ...defaultOptions, ...baseOptions };
   return Apollo.useSuspenseQuery<
     GetVehicleSchedulesForDateQuery,
     GetVehicleSchedulesForDateQueryVariables
diff --git a/ui/src/hooks/stop-registry/useGetStopDetails.ts b/ui/src/hooks/stop-registry/useGetStopDetails.ts
index c16fe977f..4160edfd0 100644
--- a/ui/src/hooks/stop-registry/useGetStopDetails.ts
+++ b/ui/src/hooks/stop-registry/useGetStopDetails.ts
@@ -3,11 +3,13 @@ import compact from 'lodash/compact';
 import { useMemo } from 'react';
 import {
   GetHighestPriorityStopDetailsByLabelAndDateQuery,
+  GetStopPlaceDetailsQuery,
   InfoSpotDetailsFragment,
   ScheduledStopPointDetailFieldsFragment,
   StopPlaceDetailsFragment,
   StopRegistryPosterInput,
   useGetHighestPriorityStopDetailsByLabelAndDateQuery,
+  useGetStopPlaceDetailsQuery,
 } from '../../generated/graphql';
 import {
   StopPlaceEnrichmentProperties,
@@ -16,6 +18,7 @@ import {
 } from '../../utils';
 import { useObservationDateQueryParam } from '../urlQuery';
 import { useRequiredParams } from '../useRequiredParams';
+import { get } from 'lodash';
 
 const GQL_SCHEDULED_STOP_POINT_DETAIL_FIELDS = gql`
   fragment scheduled_stop_point_detail_fields on service_pattern_scheduled_stop_point {
@@ -77,6 +80,16 @@ const GQL_GET_HIGHEST_PRIORITY_STOP_DETAILS_BY_LABEL_AND_DATE = gql`
   }
 `;
 
+const GQL_GET_STOP_PLACE_DETAILS = gql`
+  query getStopPlaceDetails($id: String!) {
+    stop_registry {
+      stopPlace(id: $id) {
+        ...stop_place_details
+      }
+    }
+  }
+`;
+
 const GQL_SHELTER_EQUIPMENT_DETAILS = gql`
   fragment shelter_equipment_details on stop_registry_ShelterEquipment {
     id
@@ -185,18 +198,7 @@ const GQL_STOP_PLACE_ORGANISATION_FIELDS = gql`
 const GQL_STOP_PLACE_DETAILS = gql`
   fragment stop_place_details on stop_registry_StopPlace {
     id
-    name {
-      lang
-      value
-    }
-    description {
-      lang
-      value
-    }
-    shortName {
-      lang
-      value
-    }
+
     alternativeNames {
       name {
         lang
@@ -204,64 +206,17 @@ const GQL_STOP_PLACE_DETAILS = gql`
       }
       nameType
     }
-    keyValues {
-      key
-      values
-    }
-    transportMode
-    stopPlaceType
-    weighting
-    submode
-    publicCode
+
     privateCode {
       value
       type
     }
-    geometry {
-      coordinates
-      type
-    }
-    topographicPlace {
-      ...topographic_place_details
-    }
-    fareZones {
-      ...fare_zone_details
-    }
-    placeEquipments {
-      generalSign {
-        privateCode {
-          value
-          type
-        }
-        signContentType
-        numberOfFrames
-        lineSignage
-        mainLineSign
-        replacesRailSign
-        note {
-          lang
-          value
-        }
-      }
-    }
-    quays {
-      ...quay_details
-    }
-    accessibilityAssessment {
-      id
-      hslAccessibilityProperties {
-        ...hsl_accessibility_properties_details
-      }
-      limitations {
-        id
-        version
-        audibleSignalsAvailable
-        escalatorFreeAccess
-        liftFreeAccess
-        stepFreeAccess
-        wheelchairAccess
-      }
+
+    name {
+      lang
+      value
     }
+
     organisations {
       relationshipType
       organisationRef
@@ -269,17 +224,22 @@ const GQL_STOP_PLACE_DETAILS = gql`
         ...stop_place_organisation_fields
       }
     }
-    infoSpots {
-      ...info_spot_details
-    }
-    groups {
-      id
+
+    geometry {
+      type
+      coordinates
     }
-    adjacentSites {
-      ref
+
+    keyValues {
+      key
+      values
     }
-    tariffZones {
-      id
+
+    weighting
+    submode
+
+    quays {
+      ...quay_details
     }
   }
 `;
@@ -349,10 +309,6 @@ const getEnrichedStopPlace = (
   return {
     ...stopPlace,
     ...getStopPlaceDetailsForEnrichment(stopPlace),
-    infoSpots: sortInfoSpots(stopPlace.infoSpots)?.map((spot) => ({
-      ...spot,
-      poster: spot.poster ? sortPosters(spot.poster) : null,
-    })),
   };
 };
 
@@ -361,6 +317,10 @@ export type StopWithDetails = ScheduledStopPointDetailFieldsFragment & {
   stop_place: EnrichedStopPlace | null;
 };
 
+export type StopPlaceWithDetails = {
+  stop_place: EnrichedStopPlace | null;
+};
+
 const getStopDetails = (
   data: GetHighestPriorityStopDetailsByLabelAndDateQuery | undefined,
 ): StopWithDetails | null => {
@@ -392,3 +352,30 @@ export const useGetStopDetails = () => {
 
   return { ...rest, stopDetails };
 };
+
+const getStopPlaceDetails = (
+  data: GetStopPlaceDetailsQuery | undefined,
+): StopPlaceWithDetails | null => {
+
+  const [stopPlace] = getStopPlacesFromQueryResult<StopPlace>(
+    data?.stop_registry?.stopPlace,
+  );
+
+  return {
+    stop_place: getEnrichedStopPlace(stopPlace),
+  };
+};
+
+export const useGetStopPlaceDetails = () => {
+  const { id } = useRequiredParams<{ id: string }>();
+
+  console.log(id)
+
+  const { data, ...rest } = useGetStopPlaceDetailsQuery({
+    variables: { id },
+  });
+
+  const stopPlaceDetails = useMemo(() => getStopPlaceDetails(data), [data]);
+
+  return { ...rest, stopPlaceDetails };
+};
\ No newline at end of file
diff --git a/ui/src/utils/stop-registry/stopPlace.ts b/ui/src/utils/stop-registry/stopPlace.ts
index a1dc4faee..0302cdf4b 100644
--- a/ui/src/utils/stop-registry/stopPlace.ts
+++ b/ui/src/utils/stop-registry/stopPlace.ts
@@ -14,7 +14,8 @@ import {
   StopRegistrySubmodeType,
 } from '../../generated/graphql';
 import { hasTypeName } from '../../graphql';
-import { StopPlaceState } from '../../types/stop-registry';
+import { StopPlaceMaintenance } from '@hsl/jore4-test-db-manager';
+import { mapLngLatToPoint } from '../gis';
 
 type StopPlaceType = Pick<StopRegistryStopPlace, '__typename'>;
 type ParentStopPlaceType = Pick<StopRegistryParentStopPlace, '__typename'>;
@@ -52,7 +53,6 @@ export const getStopPlacesFromQueryResult = <T extends StopPlaceType>(
 export const defaultAccessibilityLevel = StopRegistryAccessibilityLevel.Unknown;
 
 export type StopPlaceEnrichmentProperties = {
-  nameFin: string | undefined;
   nameSwe: string | undefined;
   nameLongFin: string | undefined;
   nameLongSwe: string | undefined;
@@ -60,21 +60,14 @@ export type StopPlaceEnrichmentProperties = {
   abbreviationSwe: string | undefined;
   abbreviation5CharFin: string | undefined;
   abbreviation5CharSwe: string | undefined;
-  elyNumber: string | undefined;
-  locationFin: string | undefined;
-  locationSwe: string | undefined;
-  streetAddress: string | undefined;
-  postalCode: string | undefined;
-  municipality: string | undefined;
-  fareZone: string | undefined;
-  functionalArea: number | undefined;
-  stopState: StopPlaceState | undefined;
-  accessibilityLevel: StopRegistryAccessibilityLevel;
+  name: string | undefined;
+  locationLat: number | undefined;
+  locationLong: number | undefined;
+  validityStart: string | undefined;
+  validityEnd?: string | undefined;
   stopType: {
-    mainLine: boolean;
     interchange: boolean;
     railReplacement: boolean;
-    virtual: boolean;
   };
 };
 
@@ -218,6 +211,14 @@ const findKeyValueParsed = <T = string>(
   return parser(keyValue);
 };
 
+const findCoordinate = (
+  stopPlace: StopRegistryStopPlace,
+  coordinate: 'latitude' | 'longitude',
+): number | undefined => {
+  const coordinates = stopPlace.geometry?.coordinates ?? undefined;
+  return coordinates ? mapLngLatToPoint(coordinates)[coordinate] : undefined;
+};
+
 export const getStopPlaceDetailsForEnrichment = <
   T extends StopRegistryStopPlace,
 >(
@@ -225,7 +226,6 @@ export const getStopPlaceDetailsForEnrichment = <
 ): StopPlaceEnrichmentProperties => {
   /* eslint-disable @typescript-eslint/prefer-nullish-coalescing */
   return {
-    nameFin: stopPlace.name?.value || undefined,
     nameSwe:
       findAlternativeName(stopPlace, 'swe', StopRegistryNameType.Translation)
         ?.value || undefined,
@@ -253,28 +253,17 @@ export const getStopPlaceDetailsForEnrichment = <
     abbreviation5CharSwe:
       findAlternativeName(stopPlace, 'swe', StopRegistryNameType.Label)
         ?.value || undefined,
-    elyNumber: stopPlace.privateCode?.value || undefined,
-    locationFin: stopPlace.description?.value || undefined,
-    locationSwe:
-      findAlternativeName(stopPlace, 'swe', StopRegistryNameType.Other)
-        ?.value || undefined,
-    streetAddress: findKeyValue(stopPlace, 'streetAddress'),
-    postalCode: findKeyValue(stopPlace, 'postalCode'),
-    municipality: stopPlace.topographicPlace?.name?.value || undefined,
-    fareZone: stopPlace.fareZones?.[0]?.name?.value || undefined,
-    functionalArea: findKeyValueParsed(stopPlace, 'functionalArea', parseFloat),
-    stopState: findKeyValue(stopPlace, 'stopState') as StopPlaceState,
-    accessibilityLevel:
-      stopPlace.accessibilityAssessment?.hslAccessibilityProperties
-        ?.accessibilityLevel ?? defaultAccessibilityLevel,
+    name: stopPlace.name?.value || undefined,
+    locationLat: findCoordinate(stopPlace, 'latitude'),
+    locationLong: findCoordinate(stopPlace, 'longitude'),
+    validityStart: findKeyValue(stopPlace, 'validityStart'),
+    validityEnd: findKeyValue(stopPlace, 'validityEnd'),
     stopType: {
-      mainLine: findKeyValue(stopPlace, 'mainLine') === 'true',
       interchange:
         stopPlace.weighting ===
         StopRegistryInterchangeWeightingType.RecommendedInterchange,
       railReplacement:
         stopPlace.submode === StopRegistrySubmodeType.RailReplacementBus,
-      virtual: findKeyValue(stopPlace, 'virtual') === 'true',
     },
   };
   /* eslint-enable @typescript-eslint/prefer-nullish-coalescing */