diff --git a/src/components/Search/index.tsx b/src/components/Search/index.tsx
index d4cea9721..151fc922c 100644
--- a/src/components/Search/index.tsx
+++ b/src/components/Search/index.tsx
@@ -11,6 +11,7 @@ import { LanguageContext } from '../../context/LanguageContext';
 import { defineMessages, useIntl } from 'react-intl';
 import Header from '../Common/Header';
 import PageTitle from '../Common/PageTitle';
+import Error from '../../pages/_error';
 
 const messages = defineMessages({
   search: 'Search',
@@ -53,7 +54,7 @@ const Search: React.FC = () => {
   };
 
   if (error) {
-    return <div>{error}</div>;
+    return <Error statusCode={error.code} />;
   }
 
   const titles = data?.reduce(
diff --git a/src/hooks/useSearchInput.ts b/src/hooks/useSearchInput.ts
index 21cfd9831..8e879279a 100644
--- a/src/hooks/useSearchInput.ts
+++ b/src/hooks/useSearchInput.ts
@@ -11,6 +11,7 @@ const extraEncodes: [RegExp, string][] = [
   [/\(/g, '%28'],
   [/\)/g, '%29'],
   [/!/g, '%21'],
+  [/\*/g, '%2A'],
 ];
 
 const encodeURIExtraParams = (string: string): string => {