diff --git a/src/apps/stable/features/search/api/useLiveTvSearch.ts b/src/apps/stable/features/search/api/useLiveTvSearch.ts
index bb87e0b6b5..2f5ce822c8 100644
--- a/src/apps/stable/features/search/api/useLiveTvSearch.ts
+++ b/src/apps/stable/features/search/api/useLiveTvSearch.ts
@@ -17,7 +17,7 @@ const fetchLiveTv = (api: Api, userId: string | undefined, searchTerm: string |
         api,
         userId,
         {
-            includeItemTypes: [BaseItemKind.LiveTvProgram],
+            includeItemTypes: [ BaseItemKind.LiveTvProgram ],
             isMovie: true,
             searchTerm: searchTerm
         },
@@ -34,7 +34,7 @@ const fetchLiveTv = (api: Api, userId: string | undefined, searchTerm: string |
         api,
         userId,
         {
-            includeItemTypes: [BaseItemKind.LiveTvProgram],
+            includeItemTypes: [ BaseItemKind.LiveTvProgram ],
             isMovie: false,
             isSeries: true,
             isSports: false,
@@ -54,7 +54,7 @@ const fetchLiveTv = (api: Api, userId: string | undefined, searchTerm: string |
         api,
         userId,
         {
-            includeItemTypes: [BaseItemKind.LiveTvProgram],
+            includeItemTypes: [ BaseItemKind.LiveTvProgram ],
             isSports: true,
             searchTerm: searchTerm
         },
@@ -70,7 +70,7 @@ const fetchLiveTv = (api: Api, userId: string | undefined, searchTerm: string |
         api,
         userId,
         {
-            includeItemTypes: [BaseItemKind.LiveTvProgram],
+            includeItemTypes: [ BaseItemKind.LiveTvProgram ],
             isKids: true,
             searchTerm: searchTerm
         },
@@ -86,7 +86,7 @@ const fetchLiveTv = (api: Api, userId: string | undefined, searchTerm: string |
         api,
         userId,
         {
-            includeItemTypes: [BaseItemKind.LiveTvProgram],
+            includeItemTypes: [ BaseItemKind.LiveTvProgram ],
             isNews: true,
             searchTerm: searchTerm
         },
@@ -102,7 +102,7 @@ const fetchLiveTv = (api: Api, userId: string | undefined, searchTerm: string |
         api,
         userId,
         {
-            includeItemTypes: [BaseItemKind.LiveTvProgram],
+            includeItemTypes: [ BaseItemKind.LiveTvProgram ],
             isMovie: false,
             isSeries: false,
             isSports: false,
@@ -122,7 +122,7 @@ const fetchLiveTv = (api: Api, userId: string | undefined, searchTerm: string |
         api,
         userId,
         {
-            includeItemTypes: [BaseItemKind.TvChannel],
+            includeItemTypes: [ BaseItemKind.TvChannel ],
             searchTerm: searchTerm
         },
         { signal }
diff --git a/src/apps/stable/features/search/api/useSearchItems.ts b/src/apps/stable/features/search/api/useSearchItems.ts
index f36be74dfd..4b7ba84114 100644
--- a/src/apps/stable/features/search/api/useSearchItems.ts
+++ b/src/apps/stable/features/search/api/useSearchItems.ts
@@ -1,7 +1,5 @@
-import type {
-    BaseItemDto,
-    BaseItemKind
-} from '@jellyfin/sdk/lib/generated-client';
+import { BaseItemKind } from '@jellyfin/sdk/lib/generated-client/models/base-item-kind';
+import type { BaseItemDto } from '@jellyfin/sdk/lib/generated-client/models/base-item-dto';
 import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
 import { useQuery } from '@tanstack/react-query';
 import { useApi } from '../../../../../hooks/useApi';
diff --git a/src/apps/stable/features/search/components/SearchFields.tsx b/src/apps/stable/features/search/components/SearchFields.tsx
index cd36dc2386..705144aff5 100644
--- a/src/apps/stable/features/search/components/SearchFields.tsx
+++ b/src/apps/stable/features/search/components/SearchFields.tsx
@@ -1,9 +1,9 @@
 import React, { type ChangeEvent, type FC, useCallback, useRef } from 'react';
-import AlphaPicker from '../../../../../components/alphaPicker/AlphaPickerComponent';
+import AlphaPicker from 'components/alphaPicker/AlphaPickerComponent';
 import Input from 'elements/emby-input/Input';
-import globalize from '../../../../../lib/globalize';
-import layoutManager from '../../../../../components/layoutManager';
-import browser from '../../../../../scripts/browser';
+import globalize from 'lib/globalize';
+import layoutManager from 'components/layoutManager';
+import browser from 'scripts/browser';
 import 'material-design-icons-iconfont';
 import 'styles/flexstyles.scss';
 import './searchfields.scss';
diff --git a/src/apps/stable/features/search/components/SearchResults.tsx b/src/apps/stable/features/search/components/SearchResults.tsx
index 1f20c15ebb..d6f73a9ad7 100644
--- a/src/apps/stable/features/search/components/SearchResults.tsx
+++ b/src/apps/stable/features/search/components/SearchResults.tsx
@@ -1,7 +1,7 @@
 import React, { type FC } from 'react';
 import { useSearchItems } from '../api/useSearchItems';
-import globalize from '../../../../../lib/globalize';
-import Loading from '../../../../../components/loading/LoadingComponent';
+import globalize from 'lib/globalize';
+import Loading from 'components/loading/LoadingComponent';
 import SearchResultsRow from './SearchResultsRow';
 import { CardShape } from 'utils/card';
 import { CollectionType } from '@jellyfin/sdk/lib/generated-client/models/collection-type';
diff --git a/src/apps/stable/features/search/components/SearchSuggestions.tsx b/src/apps/stable/features/search/components/SearchSuggestions.tsx
index d222443fdc..a63514d157 100644
--- a/src/apps/stable/features/search/components/SearchSuggestions.tsx
+++ b/src/apps/stable/features/search/components/SearchSuggestions.tsx
@@ -1,21 +1,21 @@
 import React, { FunctionComponent } from 'react';
 
 import Loading from 'components/loading/LoadingComponent';
-import { appRouter } from '../../../../../components/router/appRouter';
+import { appRouter } from 'components/router/appRouter';
 import { useSearchSuggestions } from '../api/useSearchSuggestions';
 import globalize from 'lib/globalize';
-import LinkButton from '../../../../../elements/emby-button/LinkButton';
+import LinkButton from 'elements/emby-button/LinkButton';
 
-import '../../../../../elements/emby-button/emby-button';
+import 'elements/emby-button/emby-button';
 
 type SearchSuggestionsProps = {
     parentId?: string | null;
 };
 
 const SearchSuggestions: FunctionComponent<SearchSuggestionsProps> = ({ parentId }) => {
-    const { isLoading, data: suggestions } = useSearchSuggestions(parentId || undefined);
+    const { data: suggestions, isPending } = useSearchSuggestions(parentId || undefined);
 
-    if (isLoading) return <Loading />;
+    if (isPending) return <Loading />;
 
     return (
         <div
diff --git a/src/strings/en-us.json b/src/strings/en-us.json
index 02b856225c..ce4ede183a 100644
--- a/src/strings/en-us.json
+++ b/src/strings/en-us.json
@@ -1451,7 +1451,7 @@
     "ReplaceExistingImages": "Replace existing images",
     "ReplaceTrickplayImages": "Replace existing trickplay images",
     "Retry": "Retry",
-    "RetryWithGlobalSearch": "Retry with global search",
+    "RetryWithGlobalSearch": "Retry with a global search",
     "Reset": "Reset",
     "ResetPassword": "Reset Password",
     "ResolutionMatchSource": "Match Source",