diff --git a/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx b/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx
index 98ce04738..819b59d6d 100644
--- a/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/booking/search/page.tsx
@@ -10,7 +10,7 @@ import { apiClient } from '@/lib/api-client';
 import { useBookingStore } from '@/lib/booking-store';
 import { Station } from '@/types';
 import {
-  Train, MapPin, ArrowRight, ArrowLeftRight, Plus, Minus, Search,
+  MapPin, ArrowRight, ArrowLeftRight, Plus, Minus, Search,
   Users, ChevronDown, Gift, Check, X, ChevronLeft, Clock, Zap,
 } from 'lucide-react';
 import { useEffect, useRef, useState, useCallback } from 'react';
@@ -393,7 +393,6 @@ export default function SearchPage() {
   const setSearchCriteria = useBookingStore((s) => s.setSearchCriteria);
   const { user, isAuthenticated } = useAuthStore();
 
-  const [isPassengerOpen, setIsPassengerOpen] = useState(false);
   const [passengerModalOpen, setPassengerModalOpen] = useState(false);
   const [promoVisible, setPromoVisible] = useState(false);
   const [promoCode, setPromoCode] = useState('');
@@ -421,7 +420,7 @@ export default function SearchPage() {
     queryFn: async () => await apiClient.get('/stations') as Station[],
   });
 
-  const { register, handleSubmit, watch, setValue, formState: { errors } } = useForm<SearchForm>({
+  const { handleSubmit, watch, setValue, formState: { errors } } = useForm<SearchForm>({
     resolver: zodResolver(searchSchema as any),
     defaultValues: {
       adultCount: 1,
@@ -457,7 +456,7 @@ export default function SearchPage() {
   useEffect(() => {
     const handler = (e: MouseEvent) => {
       if (passengerRef.current && !passengerRef.current.contains(e.target as Node)) {
-        setIsPassengerOpen(false);
+        setPassengerModalOpen(false);
       }
     };
     document.addEventListener('mousedown', handler);
diff --git a/apps/edr-passenger-web/portal/src/app/page.tsx b/apps/edr-passenger-web/portal/src/app/page.tsx
index c48063991..5e717705f 100644
--- a/apps/edr-passenger-web/portal/src/app/page.tsx
+++ b/apps/edr-passenger-web/portal/src/app/page.tsx
@@ -1 +1,10 @@
-export { default } from '@/app/booking/search/page';
+import { Suspense } from 'react';
+import SearchPage from '@/app/booking/search/page';
+
+export default function Home() {
+  return (
+    <Suspense>
+      <SearchPage />
+    </Suspense>
+  );
+}