diff --git a/frontend/src/components/ActivitySearchFilter/useActivitySearchFilter.ts b/frontend/src/components/ActivitySearchFilter/useActivitySearchFilter.ts
index 35e6c471a..481f12ac4 100644
--- a/frontend/src/components/ActivitySearchFilter/useActivitySearchFilter.ts
+++ b/frontend/src/components/ActivitySearchFilter/useActivitySearchFilter.ts
@@ -12,7 +12,6 @@ export const useActivitySearchFilter = () => {
   const language = useRouter().locale ?? getDefaultLanguage();
   const { data: activities } = useQuery<ActivityFilter[], Error>({
     queryKey: ['homeActivities', language],
-
     queryFn: () => getActivityBarContent(language, activityBar.links),
   });
 
diff --git a/frontend/src/components/pages/details/useDetails.tsx b/frontend/src/components/pages/details/useDetails.tsx
index 5cf24c213..f09dd9658 100644
--- a/frontend/src/components/pages/details/useDetails.tsx
+++ b/frontend/src/components/pages/details/useDetails.tsx
@@ -59,7 +59,7 @@ export const useDetails = (
   const parentIdString = isUrlString(parentId) ? parentId : '';
   const { data: trekFamily } = useQuery<TrekFamily | null, Error>({
     queryKey: ['trekFamily', parentIdString, language],
-    queryFn: () => getTrekFamily(isUrlString(parentId) ? parentId : '', language),
+    queryFn: () => getTrekFamily(parentIdString, language),
     enabled: isUrlString(parentId),
     staleTime: ONE_DAY,
   });
diff --git a/frontend/src/components/pages/flatPage/useFlatPage.tsx b/frontend/src/components/pages/flatPage/useFlatPage.tsx
index ae9117cd2..19cb14ae0 100644
--- a/frontend/src/components/pages/flatPage/useFlatPage.tsx
+++ b/frontend/src/components/pages/flatPage/useFlatPage.tsx
@@ -35,7 +35,7 @@ export const useFlatPage = (flatPageUrl: string | undefined) => {
   );
 
   const { data: activitySuggestions = [] } = useQuery<ActivitySuggestion[] | [], Error>({
-    queryKey: ['activitySuggestions', ...activitySuggestionIds, id, language],
+    queryKey: ['activitySuggestions', activitySuggestionIds, language],
     queryFn: () => getActivitySuggestions(suggestions, language, commonDictionaries),
     enabled: suggestions.length > 0 && commonDictionaries !== undefined,
   });
diff --git a/frontend/src/components/pages/home/useHome.ts b/frontend/src/components/pages/home/useHome.ts
index 96247a421..ccea4c93a 100644
--- a/frontend/src/components/pages/home/useHome.ts
+++ b/frontend/src/components/pages/home/useHome.ts
@@ -23,7 +23,7 @@ export const useHome = (): UseHome => {
   const commonDictionaries = useQueryCommonDictionaries(language);
 
   const { data = [] } = useQuery<ActivitySuggestion[] | [], Error>({
-    queryKey: ['activitySuggestions', `Suggestion-${activitySuggestionIds.join('-')}`, language],
+    queryKey: ['activitySuggestions', activitySuggestionIds, language],
     queryFn: () => getActivitySuggestions(suggestions, language, commonDictionaries),
     enabled: suggestions.length > 0 && commonDictionaries !== undefined,
   });
diff --git a/frontend/src/components/pages/search/hooks/useTrekResults.ts b/frontend/src/components/pages/search/hooks/useTrekResults.ts
index 4d20813b8..d095d62a3 100644
--- a/frontend/src/components/pages/search/hooks/useTrekResults.ts
+++ b/frontend/src/components/pages/search/hooks/useTrekResults.ts
@@ -80,11 +80,11 @@ export const useTrekResults = (
   } = useInfiniteQuery<SearchResults, Error>({
     queryKey: [
       'trekResults',
-      JSON.stringify(parsedFiltersState),
+      parsedFiltersState,
       language,
       parseTextFilter(textFilterState),
       parseBboxFilter(bboxState),
-      JSON.stringify(dateFilter),
+      dateFilter,
       page,
     ],
     queryFn: ({
diff --git a/frontend/src/pages/index.tsx b/frontend/src/pages/index.tsx
index baf83c3ee..95d70f988 100644
--- a/frontend/src/pages/index.tsx
+++ b/frontend/src/pages/index.tsx
@@ -25,7 +25,7 @@ export const getServerSideProps: GetServerSideProps = async context => {
     );
 
     await queryClient.prefetchQuery({
-      queryKey: ['activitySuggestions', `Suggestion-${activitySuggestionIds.join('-')}`, locale],
+      queryKey: ['activitySuggestions', activitySuggestionIds, locale],
       queryFn: () => getActivitySuggestions(suggestions, locale, commonDictionaries),
     });
   }
diff --git a/frontend/src/pages/information/[flatPage].tsx b/frontend/src/pages/information/[flatPage].tsx
index 5e8199d54..f95b93dab 100644
--- a/frontend/src/pages/information/[flatPage].tsx
+++ b/frontend/src/pages/information/[flatPage].tsx
@@ -48,7 +48,7 @@ export const getServerSideProps: GetServerSideProps = async context => {
       );
 
       await queryClient.prefetchQuery({
-        queryKey: ['activitySuggestions', ...activitySuggestionIds, id, locale],
+        queryKey: ['activitySuggestions', activitySuggestionIds, locale],
         queryFn: () => getActivitySuggestions(suggestions, locale, commonDictionaries),
       });
 
diff --git a/frontend/src/pages/search.tsx b/frontend/src/pages/search.tsx
index c0e387c54..e4c43b2e9 100644
--- a/frontend/src/pages/search.tsx
+++ b/frontend/src/pages/search.tsx
@@ -72,11 +72,11 @@ export const getServerSideProps: GetServerSideProps = async context => {
     await queryClient.prefetchInfiniteQuery({
       queryKey: [
         'trekResults',
-        JSON.stringify(parsedInitialFiltersState),
+        parsedInitialFiltersState,
         context.locale,
         initialTextFilter,
         bboxFilter,
-        JSON.stringify(dateFilter),
+        dateFilter,
         page,
       ],
       queryFn: () =>