diff --git a/components/lib/MoveModal.tsx b/components/lib/MoveModal.tsx
index 67d22f19..088f4e42 100644
--- a/components/lib/MoveModal.tsx
+++ b/components/lib/MoveModal.tsx
@@ -5,13 +5,10 @@ import {
   Heading,
   Select,
 } from '@navikt/ds-react'
-import {
-  SearchType,
-  useSearchContentWithOptionsQuery,
-} from '../../lib/schema/graphql'
 import LoaderSpinner from './spinner'
 import { useState } from 'react'
 import ErrorMessage from './error'
+import { useSearch } from '../../lib/rest/search'
 
 interface MoveModalProps {
   open: boolean
@@ -31,15 +28,10 @@ export const MoveModal = ({
     undefined
   )
   const [error, setError] = useState<string | undefined>(undefined)
-  const search = useSearchContentWithOptionsQuery({
-    variables: {
-      options: { types: ['dataproduct'] as SearchType[], groups: [group] },
-    },
-    fetchPolicy: 'network-only',
-  })
+  const search = useSearch({ types: ['dataproduct'], groups: [group] })
 
   if (search.error) return <ErrorMessage error={search.error} />
-  if (search.loading || !search.data?.search) return <LoaderSpinner />
+  if (search.loading || !search.data?.results) return <LoaderSpinner />
 
   return (
     <Modal open={open} onClose={onCancel} header={{heading: "Flytt datasett"}}>
@@ -56,7 +48,7 @@ export const MoveModal = ({
           onChange={(event) => setDataproductID(event.target.value)}
         >
           <option value="">Velg dataprodukt</option>
-          {search.data?.search?.map(
+          {search.data?.results?.map(
             (dp) =>
               currentDataproductID !== dp.result.id && (
                 <option value={dp.result.id} key={dp.result.id}>
diff --git a/components/search/resultList.tsx b/components/search/resultList.tsx
index e4c67159..d3b0d93b 100644
--- a/components/search/resultList.tsx
+++ b/components/search/resultList.tsx
@@ -1,10 +1,4 @@
 import { QueryResult } from '@apollo/client'
-import {
-  Exact,
-  SearchContentWithOptionsQuery,
-  SearchOptions,
-  useDeleteStoryMutation,
-} from '../../lib/schema/graphql'
 import ErrorMessage from '../lib/error'
 import LoaderSpinner from '../lib/spinner'
 import SearchResultLink from './searchResultLink'
@@ -15,16 +9,15 @@ import { USER_INFO } from '../../lib/queries/userInfo/userInfo'
 import { UserState } from '../../lib/context'
 import { useSearchTeamKatalogen } from '../../lib/rest/teamkatalogen'
 import { useGetProductAreas } from '../../lib/rest/productAreas'
+import { SearchResult } from '../../lib/rest/search'
+import { useDeleteStoryMutation } from '../../lib/schema/graphql'
 
 const Results = ({ children }: { children: React.ReactNode }) => (
   <div className="results">{children}</div>
 )
 
 type ResultListInterface = {
-  search?: QueryResult<
-    SearchContentWithOptionsQuery,
-    Exact<{ options: SearchOptions }>
-  >
+  search?: {data: SearchResult|undefined, loading: boolean, error: any}
   dataproducts?: {
     __typename?: 'Dataproduct' | undefined
     id: string
@@ -64,23 +57,6 @@ const ResultList = ({
   searchParam,
   updateQuery,
 }: ResultListInterface) => {
-  useEffect(() => {
-    if (!!searchParam) {
-      if (
-        search?.data?.search.filter(
-          (d) => d.result.__typename === 'Dataproduct'
-        ).length == 0
-      ) {
-        updateQuery?.({ ...searchParam, preferredType: 'story' })
-      } else if (
-        search?.data?.search.filter((d) => d.result.__typename === 'Story')
-          .length == 0
-      ) {
-        updateQuery?.({ ...searchParam, preferredType: 'dataproduct' })
-      }
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [search])
   const [deleteStoryQuery] = useDeleteStoryMutation()
   const userInfo = useContext(UserState)
   const { searchResult: teamkatalogen } = useSearchTeamKatalogen()
@@ -96,6 +72,8 @@ const ResultList = ({
     ]
   })
 
+  const isDataProduct = (item: any) => !!item.datasets
+
   const getTeamKatalogenInfo = (item: any) => {
     const getTeamID = (url: string)  => {
       var urlComponents = url?.split("/")
@@ -115,11 +93,11 @@ const ResultList = ({
 
     if (error) return <ErrorMessage error={error} />
     if (loading || !data) return <LoaderSpinner />
-    const dataproducts = data.search.filter(
-      (d) => d.result.__typename === 'Dataproduct'
+    const dataproducts = data.results.filter(
+      (d) => isDataProduct(d.result)
     )
-    const datastories = data.search.filter(
-      (d) => d.result.__typename === 'Story'
+    const datastories = data.results.filter(
+      (d) => !isDataProduct(d.result)
     )
 
     //dataproducts.forEach((d) => console.log(getTeamKatalogenInfo(d.result)?.teamkatalogenTeam))
@@ -147,7 +125,7 @@ const ResultList = ({
             {datastories.map(
               (it, idx) =>
               (
-                it.result.__typename === 'Story' && (
+                !isDataProduct(it.result) && (
                   <SearchResultLink
                     key={idx}
                     name={it.result.name}
@@ -169,7 +147,7 @@ const ResultList = ({
           <Tabs.Panel className="flex flex-col gap-4" value="dataproduct">
             {dataproducts.map(
               (d, idx) =>
-                d.result.__typename === 'Dataproduct' && (
+                isDataProduct(d.result) && (
                   <SearchResultLink
                     key={idx}
                     group={d.result.owner}
@@ -184,7 +162,7 @@ const ResultList = ({
             )}
           </Tabs.Panel>
         </Tabs>
-        {data.search.length == 0 && 'ingen resultater'}
+        {data.results.length == 0 && 'ingen resultater'}
       </Results>
     )
   }
diff --git a/components/search/searchResultLink.tsx b/components/search/searchResultLink.tsx
index 13deccbe..060d5a14 100644
--- a/components/search/searchResultLink.tsx
+++ b/components/search/searchResultLink.tsx
@@ -27,9 +27,7 @@ export interface SearchResultProps {
   description?: string
   datasets?: {
     name: string
-    datasource: {
-      lastModified: string,
-    }
+    dataSourceLastModified: string
   }[]
   teamkatalogenTeam?: string,
   productArea?: string,
@@ -140,7 +138,7 @@ export const SearchResultLink = ({
                   {datasets.map((ds, index) => (
                     <div key={index}>
                       <p dangerouslySetInnerHTML={{ __html: ds.name.replaceAll("_", "_<wbr>") }} />
-                      <Detail className="text-text-subtle">Sist oppdatert: {humanizeDate(ds.datasource.lastModified)}</Detail>
+                      <Detail className="text-text-subtle">Sist oppdatert: {humanizeDate(ds.dataSourceLastModified)}</Detail>
                     </div>
                   ))}
                 </div>
diff --git a/lib/queries/search/resultCount.tsx b/lib/queries/search/resultCount.tsx
deleted file mode 100644
index 5488f4f3..00000000
--- a/lib/queries/search/resultCount.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-export interface ResultCountProps {
-  resultCount?: number
-}
-
-export const ResultCount = ({ resultCount }: ResultCountProps) => {
-  if (typeof resultCount === 'undefined') return <div>Søker...</div>
-  if (resultCount)
-    return <div className="pl-3 my-8">Søket ga {resultCount} treff</div>
-  return <div className="pl-3 my-8">Søket ga ingen resultater!</div>
-}
diff --git a/lib/queries/search/searchResult.ts b/lib/queries/search/searchResult.ts
deleted file mode 100644
index abe9d4fc..00000000
--- a/lib/queries/search/searchResult.ts
+++ /dev/null
@@ -1,35 +0,0 @@
-import { gql } from 'graphql-tag'
-
-export const SEARCH_CONTENT = gql`
-  query searchContent($q: SearchQuery!) {
-    search(q: $q) {
-      excerpt
-      result {
-        ... on Dataproduct {
-          __typename
-          id
-          name
-          description
-          created
-          lastModified
-          keywords
-          slug
-          datasets{
-            name
-            datasource {
-              type: __typename
-              ... on BigQuery {
-                lastModified
-              }
-            }
-          }
-          owner {
-            group
-            teamkatalogenURL
-            teamContact
-          }
-        }
-      }
-    }
-  }
-`
diff --git a/lib/queries/search/searchResultWithOptions.ts b/lib/queries/search/searchResultWithOptions.ts
deleted file mode 100644
index b530c974..00000000
--- a/lib/queries/search/searchResultWithOptions.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-import { gql } from 'graphql-tag'
-
-export const SEARCH_CONTENT_WITH_OPTIONS = gql`
-  query searchContentWithOptions($options: SearchOptions!) {
-    search(options: $options) {
-      excerpt
-      result {
-        ... on Dataproduct {
-          __typename
-          id
-          name
-          description
-          created
-          lastModified
-          keywords
-          slug
-          datasets{
-            id
-            name
-            datasource {
-              type: __typename
-              ... on BigQuery {
-                lastModified
-                table
-              }
-            }
-          }
-          owner {
-            group
-            teamkatalogenURL
-            teamContact
-          }
-        }
-        ... on Story {
-          __typename
-          id
-          name
-          description
-          created
-          groupName: group
-          teamkatalogenURL
-          keywords
-          modified: lastModified
-        }
-      }
-    }
-  }
-`
diff --git a/lib/rest/restApi.ts b/lib/rest/restApi.ts
index 22c4c608..09f533d8 100644
--- a/lib/rest/restApi.ts
+++ b/lib/rest/restApi.ts
@@ -1,21 +1,47 @@
+import { SearchOptions } from "./search"
+
 const isServer = typeof window === 'undefined'
 
 export const apiUrl = () => {
-    if (process.env.NEXT_PUBLIC_ENV === 'development') {
-      return 'http://localhost:8080/api'
-    }
-    return isServer ? 'http://nada-backend/api' : '/api'
+  if (process.env.NEXT_PUBLIC_ENV === 'development') {
+    return 'http://localhost:8080/api'
+  }
+  return isServer ? 'http://nada-backend/api' : '/api'
 }
 
 export const getDataproductUrl = (id: string) => `${apiUrl()}/dataproducts/${id}`
 export const getDatasetUrl = (id: string) => `${apiUrl()}/datasets/${id}`
 export const getProductAreasUrl = () => `${apiUrl()}/productareas`
 export const getProductAreaUrl = (id: string) => `${apiUrl()}/productareas/${id}`
-export const searchTeamKatalogenUrl = (gcpGroups?: string[]) => 
-{
-  const parameters = gcpGroups?.length ? gcpGroups.map(group => `gcpGroups=${encodeURIComponent(group)}`).join('&'): ''
+export const searchTeamKatalogenUrl = (gcpGroups?: string[]) => {
+  const parameters = gcpGroups?.length ? gcpGroups.map(group => `gcpGroups=${encodeURIComponent(group)}`).join('&') : ''
   const query = parameters ? `?${parameters}` : ''
   return `${apiUrl()}/teamkatalogen${query}`
 }
 
+export const searchUrl = (options: SearchOptions) => {
+  let queryParams: string[] = [];
+
+  // Helper function to add array-based options
+  const addArrayOptions = (optionArray: string[] | undefined, paramName: string) => {
+    if (optionArray && optionArray.length) {
+      queryParams.push(`${paramName}=${optionArray.reduce((s, p) => `${s ? `${s},` : ""}${encodeURIComponent(p)}`)}`)
+    }
+  };
+
+  // Adding array-based options
+  addArrayOptions(options.keywords, 'keywords');
+  addArrayOptions(options.groups, 'groups');
+  addArrayOptions(options.teamIDs, 'teamIDs');
+  addArrayOptions(options.services, 'services');
+  addArrayOptions(options.types, 'types');
+
+  // Adding single-value options
+  if (options.text) queryParams.push(`text=${encodeURIComponent(options.text)}`);
+  if (options.limit !== undefined) queryParams.push(`limit=${options.limit}`);
+  if (options.offset !== undefined) queryParams.push(`offset=${options.offset}`);
+
+  const query = queryParams.length ? `?${queryParams.join('&')}` : '';
+  return `${apiUrl()}/search${query}`;
+};
 
diff --git a/lib/rest/search.ts b/lib/rest/search.ts
new file mode 100644
index 00000000..6e7ba0e4
--- /dev/null
+++ b/lib/rest/search.ts
@@ -0,0 +1,59 @@
+import { useEffect, useState } from "react"
+import { searchUrl } from "./restApi"
+
+export interface SearchOptions {
+    // Freetext search
+    text?: string
+    // Filter on keyword
+    keywords?: string[]
+    // Filter on group
+    groups?: string[]
+    //Filter on team_id
+    teamIDs?: string[]
+    // Filter on enabled services
+    services?: string[]
+    // Filter on types
+    types?: string[]
+
+    limit?: number
+    offset?: number
+}
+
+export interface SearchResult{
+    results: any[]
+}
+
+const search = async (o: SearchOptions)=>{
+    const url = searchUrl(o);
+    const options = {
+        method: 'GET',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+    }
+    return fetch(url, options)
+}
+
+export const useSearch = (o: SearchOptions)=>{
+    const [data, setData] = useState<SearchResult|undefined>(undefined)
+    const [loading, setLoading] = useState(false)
+    const [error, setError] = useState(null)
+
+
+    useEffect(()=>{
+        search(o).then((res)=> res.json())
+        .then((data)=>
+        {
+            setError(null)
+            setData(data)
+        })
+        .catch((err)=>{
+            setError(err)
+            setData(undefined)            
+        }).finally(()=>{
+            setLoading(false)
+        })
+    }, [o?JSON.stringify(o):""])
+
+    return {data, loading, error}
+}
diff --git a/lib/schema/graphql.ts b/lib/schema/graphql.ts
index a601e345..835ba476 100644
--- a/lib/schema/graphql.ts
+++ b/lib/schema/graphql.ts
@@ -1424,20 +1424,6 @@ export type CreateJoinableViewsMutationVariables = Exact<{
 
 export type CreateJoinableViewsMutation = { __typename?: 'Mutation', createJoinableViews: string };
 
-export type SearchContentQueryVariables = Exact<{
-  q: SearchQuery;
-}>;
-
-
-export type SearchContentQuery = { __typename?: 'Query', search: Array<{ __typename?: 'SearchResultRow', excerpt: string, result: { __typename: 'Dataproduct', id: string, name: string, description: string, created: any, lastModified: any, keywords: Array<string>, slug: string, datasets: Array<{ __typename?: 'Dataset', name: string, datasource: { __typename?: 'BigQuery', lastModified: any, type: 'BigQuery' } }>, owner: { __typename?: 'Owner', group: string, teamkatalogenURL?: string | null, teamContact?: string | null } } | { __typename?: 'Story' } }> };
-
-export type SearchContentWithOptionsQueryVariables = Exact<{
-  options: SearchOptions;
-}>;
-
-
-export type SearchContentWithOptionsQuery = { __typename?: 'Query', search: Array<{ __typename?: 'SearchResultRow', excerpt: string, result: { __typename: 'Dataproduct', id: string, name: string, description: string, created: any, lastModified: any, keywords: Array<string>, slug: string, datasets: Array<{ __typename?: 'Dataset', id: string, name: string, datasource: { __typename?: 'BigQuery', lastModified: any, table: string, type: 'BigQuery' } }>, owner: { __typename?: 'Owner', group: string, teamkatalogenURL?: string | null, teamContact?: string | null } } | { __typename: 'Story', id: string, name: string, description: string, created: any, teamkatalogenURL?: string | null, keywords: Array<string>, groupName: string, modified?: any | null } }> };
-
 export type SlackQueryVariables = Exact<{
   name: Scalars['String']['input'];
 }>;
@@ -1538,7 +1524,7 @@ export const DatasetAccessDocument = gql`
  *   },
  * });
  */
-export function useDatasetAccessQuery(baseOptions: Apollo.QueryHookOptions<DatasetAccessQuery, DatasetAccessQueryVariables>) {
+export function useDatasetAccessQuery(baseOptions: Apollo.QueryHookOptions<DatasetAccessQuery, DatasetAccessQueryVariables> & ({ variables: DatasetAccessQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<DatasetAccessQuery, DatasetAccessQueryVariables>(DatasetAccessDocument, options);
       }
@@ -1657,7 +1643,7 @@ export const AccessRequestDocument = gql`
  *   },
  * });
  */
-export function useAccessRequestQuery(baseOptions: Apollo.QueryHookOptions<AccessRequestQuery, AccessRequestQueryVariables>) {
+export function useAccessRequestQuery(baseOptions: Apollo.QueryHookOptions<AccessRequestQuery, AccessRequestQueryVariables> & ({ variables: AccessRequestQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<AccessRequestQuery, AccessRequestQueryVariables>(AccessRequestDocument, options);
       }
@@ -1708,7 +1694,7 @@ export const AccessRequestsForDatasetDocument = gql`
  *   },
  * });
  */
-export function useAccessRequestsForDatasetQuery(baseOptions: Apollo.QueryHookOptions<AccessRequestsForDatasetQuery, AccessRequestsForDatasetQueryVariables>) {
+export function useAccessRequestsForDatasetQuery(baseOptions: Apollo.QueryHookOptions<AccessRequestsForDatasetQuery, AccessRequestsForDatasetQueryVariables> & ({ variables: AccessRequestsForDatasetQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<AccessRequestsForDatasetQuery, AccessRequestsForDatasetQueryVariables>(AccessRequestsForDatasetDocument, options);
       }
@@ -1953,7 +1939,7 @@ export const DataproductSummaryDocument = gql`
  *   },
  * });
  */
-export function useDataproductSummaryQuery(baseOptions: Apollo.QueryHookOptions<DataproductSummaryQuery, DataproductSummaryQueryVariables>) {
+export function useDataproductSummaryQuery(baseOptions: Apollo.QueryHookOptions<DataproductSummaryQuery, DataproductSummaryQueryVariables> & ({ variables: DataproductSummaryQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<DataproductSummaryQuery, DataproductSummaryQueryVariables>(DataproductSummaryDocument, options);
       }
@@ -2072,7 +2058,7 @@ export const GcpGetAllTablesInProjectDocument = gql`
  *   },
  * });
  */
-export function useGcpGetAllTablesInProjectQuery(baseOptions: Apollo.QueryHookOptions<GcpGetAllTablesInProjectQuery, GcpGetAllTablesInProjectQueryVariables>) {
+export function useGcpGetAllTablesInProjectQuery(baseOptions: Apollo.QueryHookOptions<GcpGetAllTablesInProjectQuery, GcpGetAllTablesInProjectQueryVariables> & ({ variables: GcpGetAllTablesInProjectQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<GcpGetAllTablesInProjectQuery, GcpGetAllTablesInProjectQueryVariables>(GcpGetAllTablesInProjectDocument, options);
       }
@@ -2117,7 +2103,7 @@ export const GcpGetColumnsDocument = gql`
  *   },
  * });
  */
-export function useGcpGetColumnsQuery(baseOptions: Apollo.QueryHookOptions<GcpGetColumnsQuery, GcpGetColumnsQueryVariables>) {
+export function useGcpGetColumnsQuery(baseOptions: Apollo.QueryHookOptions<GcpGetColumnsQuery, GcpGetColumnsQueryVariables> & ({ variables: GcpGetColumnsQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<GcpGetColumnsQuery, GcpGetColumnsQueryVariables>(GcpGetColumnsDocument, options);
       }
@@ -2155,7 +2141,7 @@ export const GcpGetDatasetsDocument = gql`
  *   },
  * });
  */
-export function useGcpGetDatasetsQuery(baseOptions: Apollo.QueryHookOptions<GcpGetDatasetsQuery, GcpGetDatasetsQueryVariables>) {
+export function useGcpGetDatasetsQuery(baseOptions: Apollo.QueryHookOptions<GcpGetDatasetsQuery, GcpGetDatasetsQueryVariables> & ({ variables: GcpGetDatasetsQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<GcpGetDatasetsQuery, GcpGetDatasetsQueryVariables>(GcpGetDatasetsDocument, options);
       }
@@ -2198,7 +2184,7 @@ export const GcpGetTablesDocument = gql`
  *   },
  * });
  */
-export function useGcpGetTablesQuery(baseOptions: Apollo.QueryHookOptions<GcpGetTablesQuery, GcpGetTablesQueryVariables>) {
+export function useGcpGetTablesQuery(baseOptions: Apollo.QueryHookOptions<GcpGetTablesQuery, GcpGetTablesQueryVariables> & ({ variables: GcpGetTablesQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<GcpGetTablesQuery, GcpGetTablesQueryVariables>(GcpGetTablesDocument, options);
       }
@@ -2582,7 +2568,7 @@ export const InsightProductDocument = gql`
  *   },
  * });
  */
-export function useInsightProductQuery(baseOptions: Apollo.QueryHookOptions<InsightProductQuery, InsightProductQueryVariables>) {
+export function useInsightProductQuery(baseOptions: Apollo.QueryHookOptions<InsightProductQuery, InsightProductQueryVariables> & ({ variables: InsightProductQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<InsightProductQuery, InsightProductQueryVariables>(InsightProductDocument, options);
       }
@@ -2695,7 +2681,7 @@ export const PollyDocument = gql`
  *   },
  * });
  */
-export function usePollyQuery(baseOptions: Apollo.QueryHookOptions<PollyQuery, PollyQueryVariables>) {
+export function usePollyQuery(baseOptions: Apollo.QueryHookOptions<PollyQuery, PollyQueryVariables> & ({ variables: PollyQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<PollyQuery, PollyQueryVariables>(PollyDocument, options);
       }
@@ -2742,7 +2728,7 @@ export const JoinableViewDocument = gql`
  *   },
  * });
  */
-export function useJoinableViewQuery(baseOptions: Apollo.QueryHookOptions<JoinableViewQuery, JoinableViewQueryVariables>) {
+export function useJoinableViewQuery(baseOptions: Apollo.QueryHookOptions<JoinableViewQuery, JoinableViewQueryVariables> & ({ variables: JoinableViewQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<JoinableViewQuery, JoinableViewQueryVariables>(JoinableViewDocument, options);
       }
@@ -2831,151 +2817,6 @@ export function useCreateJoinableViewsMutation(baseOptions?: Apollo.MutationHook
 export type CreateJoinableViewsMutationHookResult = ReturnType<typeof useCreateJoinableViewsMutation>;
 export type CreateJoinableViewsMutationResult = Apollo.MutationResult<CreateJoinableViewsMutation>;
 export type CreateJoinableViewsMutationOptions = Apollo.BaseMutationOptions<CreateJoinableViewsMutation, CreateJoinableViewsMutationVariables>;
-export const SearchContentDocument = gql`
-    query searchContent($q: SearchQuery!) {
-  search(q: $q) {
-    excerpt
-    result {
-      ... on Dataproduct {
-        __typename
-        id
-        name
-        description
-        created
-        lastModified
-        keywords
-        slug
-        datasets {
-          name
-          datasource {
-            type: __typename
-            ... on BigQuery {
-              lastModified
-            }
-          }
-        }
-        owner {
-          group
-          teamkatalogenURL
-          teamContact
-        }
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useSearchContentQuery__
- *
- * To run a query within a React component, call `useSearchContentQuery` and pass it any options that fit your needs.
- * When your component renders, `useSearchContentQuery` 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 } = useSearchContentQuery({
- *   variables: {
- *      q: // value for 'q'
- *   },
- * });
- */
-export function useSearchContentQuery(baseOptions: Apollo.QueryHookOptions<SearchContentQuery, SearchContentQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<SearchContentQuery, SearchContentQueryVariables>(SearchContentDocument, options);
-      }
-export function useSearchContentLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<SearchContentQuery, SearchContentQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<SearchContentQuery, SearchContentQueryVariables>(SearchContentDocument, options);
-        }
-export function useSearchContentSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions<SearchContentQuery, SearchContentQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useSuspenseQuery<SearchContentQuery, SearchContentQueryVariables>(SearchContentDocument, options);
-        }
-export type SearchContentQueryHookResult = ReturnType<typeof useSearchContentQuery>;
-export type SearchContentLazyQueryHookResult = ReturnType<typeof useSearchContentLazyQuery>;
-export type SearchContentSuspenseQueryHookResult = ReturnType<typeof useSearchContentSuspenseQuery>;
-export type SearchContentQueryResult = Apollo.QueryResult<SearchContentQuery, SearchContentQueryVariables>;
-export const SearchContentWithOptionsDocument = gql`
-    query searchContentWithOptions($options: SearchOptions!) {
-  search(options: $options) {
-    excerpt
-    result {
-      ... on Dataproduct {
-        __typename
-        id
-        name
-        description
-        created
-        lastModified
-        keywords
-        slug
-        datasets {
-          id
-          name
-          datasource {
-            type: __typename
-            ... on BigQuery {
-              lastModified
-              table
-            }
-          }
-        }
-        owner {
-          group
-          teamkatalogenURL
-          teamContact
-        }
-      }
-      ... on Story {
-        __typename
-        id
-        name
-        description
-        created
-        groupName: group
-        teamkatalogenURL
-        keywords
-        modified: lastModified
-      }
-    }
-  }
-}
-    `;
-
-/**
- * __useSearchContentWithOptionsQuery__
- *
- * To run a query within a React component, call `useSearchContentWithOptionsQuery` and pass it any options that fit your needs.
- * When your component renders, `useSearchContentWithOptionsQuery` 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 } = useSearchContentWithOptionsQuery({
- *   variables: {
- *      options: // value for 'options'
- *   },
- * });
- */
-export function useSearchContentWithOptionsQuery(baseOptions: Apollo.QueryHookOptions<SearchContentWithOptionsQuery, SearchContentWithOptionsQueryVariables>) {
-        const options = {...defaultOptions, ...baseOptions}
-        return Apollo.useQuery<SearchContentWithOptionsQuery, SearchContentWithOptionsQueryVariables>(SearchContentWithOptionsDocument, options);
-      }
-export function useSearchContentWithOptionsLazyQuery(baseOptions?: Apollo.LazyQueryHookOptions<SearchContentWithOptionsQuery, SearchContentWithOptionsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useLazyQuery<SearchContentWithOptionsQuery, SearchContentWithOptionsQueryVariables>(SearchContentWithOptionsDocument, options);
-        }
-export function useSearchContentWithOptionsSuspenseQuery(baseOptions?: Apollo.SuspenseQueryHookOptions<SearchContentWithOptionsQuery, SearchContentWithOptionsQueryVariables>) {
-          const options = {...defaultOptions, ...baseOptions}
-          return Apollo.useSuspenseQuery<SearchContentWithOptionsQuery, SearchContentWithOptionsQueryVariables>(SearchContentWithOptionsDocument, options);
-        }
-export type SearchContentWithOptionsQueryHookResult = ReturnType<typeof useSearchContentWithOptionsQuery>;
-export type SearchContentWithOptionsLazyQueryHookResult = ReturnType<typeof useSearchContentWithOptionsLazyQuery>;
-export type SearchContentWithOptionsSuspenseQueryHookResult = ReturnType<typeof useSearchContentWithOptionsSuspenseQuery>;
-export type SearchContentWithOptionsQueryResult = Apollo.QueryResult<SearchContentWithOptionsQuery, SearchContentWithOptionsQueryVariables>;
 export const SlackDocument = gql`
     query Slack($name: String!) {
   IsValidSlackChannel(name: $name)
@@ -2998,7 +2839,7 @@ export const SlackDocument = gql`
  *   },
  * });
  */
-export function useSlackQuery(baseOptions: Apollo.QueryHookOptions<SlackQuery, SlackQueryVariables>) {
+export function useSlackQuery(baseOptions: Apollo.QueryHookOptions<SlackQuery, SlackQueryVariables> & ({ variables: SlackQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<SlackQuery, SlackQueryVariables>(SlackDocument, options);
       }
@@ -3143,7 +2984,7 @@ export const DataStoryDocument = gql`
  *   },
  * });
  */
-export function useDataStoryQuery(baseOptions: Apollo.QueryHookOptions<DataStoryQuery, DataStoryQueryVariables>) {
+export function useDataStoryQuery(baseOptions: Apollo.QueryHookOptions<DataStoryQuery, DataStoryQueryVariables> & ({ variables: DataStoryQueryVariables; skip?: boolean; } | { skip: boolean; }) ) {
         const options = {...defaultOptions, ...baseOptions}
         return Apollo.useQuery<DataStoryQuery, DataStoryQueryVariables>(DataStoryDocument, options);
       }
diff --git a/pages/dataproduct/new.tsx b/pages/dataproduct/new.tsx
index 80147628..0de9343a 100644
--- a/pages/dataproduct/new.tsx
+++ b/pages/dataproduct/new.tsx
@@ -2,11 +2,8 @@ import * as React from 'react'
 import { NewDataproductForm } from '../../components/dataproducts/newDataproductForm'
 import Head from 'next/head'
 import {
-  SearchContentDocument,
   useUserInfoDetailsQuery,
 } from '../../lib/schema/graphql'
-import { GetServerSideProps } from 'next'
-import { addApolloState, initializeApollo } from '../../lib/apollo'
 import InnerContainer from '../../components/lib/innerContainer'
 import LoaderSpinner from '../../components/lib/spinner'
 
@@ -36,20 +33,3 @@ const NewDataproduct = () => {
 }
 
 export default NewDataproduct
-
-export const getServerSideProps: GetServerSideProps = async () => {
-  const apolloClient = initializeApollo()
-
-  try {
-    await apolloClient.query({
-      query: SearchContentDocument,
-      variables: { q: { limit: 6 } },
-    })
-  } catch (e) {
-    console.log(e)
-  }
-
-  return addApolloState(apolloClient, {
-    props: {},
-  })
-}
diff --git a/pages/index.tsx b/pages/index.tsx
index 8a62940c..bbb2bc14 100644
--- a/pages/index.tsx
+++ b/pages/index.tsx
@@ -3,7 +3,6 @@ import { addApolloState, initializeApollo } from '../lib/apollo'
 import {
     KeywordsDocument,
     MetabaseProudctsDocument,
-    SearchContentDocument,
 } from '../lib/schema/graphql'
 import { useRouter } from 'next/router'
 import { FrontPageLogo } from '../components/index/frontPageLogo'
@@ -139,10 +138,6 @@ export const getServerSideProps: GetServerSideProps = async (context) => {
         await apolloClient.query({
             query: USER_INFO,
         })
-        await apolloClient.query({
-            query: SearchContentDocument,
-            variables: { q: { limit: SEARCH_LIMIT } },
-        })
         await apolloClient.query({
             query: MetabaseProudctsDocument,
         })
diff --git a/pages/insightProduct/new.tsx b/pages/insightProduct/new.tsx
index 8d519f0a..8e3cc041 100644
--- a/pages/insightProduct/new.tsx
+++ b/pages/insightProduct/new.tsx
@@ -2,7 +2,6 @@ import * as React from 'react'
 import { NewInsightProductForm } from '../../components/insightProducts/newInsightProduct'
 import Head from 'next/head'
 import {
-  SearchContentDocument,
   useUserInfoDetailsQuery,
 } from '../../lib/schema/graphql'
 import { GetServerSideProps } from 'next'
@@ -36,20 +35,3 @@ const NewInsightProduct = () => {
 }
 
 export default NewInsightProduct
-
-export const getServerSideProps: GetServerSideProps = async () => {
-  const apolloClient = initializeApollo()
-
-  try {
-    await apolloClient.query({
-      query: SearchContentDocument,
-      variables: { q: { limit: 6 } },
-    })
-  } catch (e) {
-    console.log(e)
-  }
-
-  return addApolloState(apolloClient, {
-    props: {},
-  })
-}
\ No newline at end of file
diff --git a/pages/search.tsx b/pages/search.tsx
index 67e0c33a..bee37d8b 100644
--- a/pages/search.tsx
+++ b/pages/search.tsx
@@ -13,9 +13,9 @@ import {
   KeywordsQuery,
   SearchType,
   useKeywordsQuery,
-  useSearchContentWithOptionsQuery,
 } from '../lib/schema/graphql'
 import { useGetProductAreas } from '../lib/rest/productAreas'
+import { useSearch } from '../lib/rest/search'
 
 export interface SearchParam {
   [s: string]: string | string[]
@@ -178,19 +178,14 @@ const Search = () => {
     kw,
     searchParam.keywords || []
   )
-  const search = useSearchContentWithOptionsQuery({
-    variables: {
-      options: {
+  const search = useSearch({
         limit: 1000,
         types: ['dataproduct', 'story'] as SearchType[],
         groups: [],
         teamIDs: searchParam.teams?.map((it) => teamNameToID.get(it)).filter(it=> !!it),
         keywords: searchParam.keywords.map((k) => k.includes(" (") ? k.split(" (")[0] : k),
         text: searchParam.freeText,
-      },
-    },
-    fetchPolicy: 'network-only',
-  })
+      })
 
   const updateQuery = async (updatedParam: SearchParam) => {
     await router.push(buildQueryString(updatedParam))
diff --git a/pages/story/new.tsx b/pages/story/new.tsx
index 1a41c584..1b6fedb9 100644
--- a/pages/story/new.tsx
+++ b/pages/story/new.tsx
@@ -2,11 +2,8 @@ import * as React from 'react'
 import { NewStoryForm } from '../../components/stories/newStory'
 import Head from 'next/head'
 import {
-  SearchContentDocument,
   useUserInfoDetailsQuery,
 } from '../../lib/schema/graphql'
-import { GetServerSideProps } from 'next'
-import { addApolloState, initializeApollo } from '../../lib/apollo'
 import InnerContainer from '../../components/lib/innerContainer'
 import LoaderSpinner from '../../components/lib/spinner'
 
@@ -37,19 +34,3 @@ const NewStory = () => {
 
 export default NewStory
 
-export const getServerSideProps: GetServerSideProps = async () => {
-  const apolloClient = initializeApollo()
-
-  try {
-    await apolloClient.query({
-      query: SearchContentDocument,
-      variables: { q: { limit: 6 } },
-    })
-  } catch (e) {
-    console.log(e)
-  }
-
-  return addApolloState(apolloClient, {
-    props: {},
-  })
-}