diff --git a/app/(main)/professors/[id]/@reviews/page.tsx b/app/(main)/professors/[id]/@reviews/page.tsx
index 183f025..c27b439 100644
--- a/app/(main)/professors/[id]/@reviews/page.tsx
+++ b/app/(main)/professors/[id]/@reviews/page.tsx
@@ -15,7 +15,7 @@ const getKey =
   (pageIndex: number, previousPageData: ProfessorsIDReviewsResponse) => {
     if (previousPageData && previousPageData.page === previousPageData.pages)
       return null;
-    return `/django/core/professors/${id}/reviews/?page=${pageIndex + 1}&${params}`;
+    return `/django/core/professors/${id}/reviews?page=${pageIndex + 1}&${params}`;
   };
 
 const Skeleton = () =>
diff --git a/app/(main)/professors/[id]/@schedules/page.tsx b/app/(main)/professors/[id]/@schedules/page.tsx
index f76c144..68d7a0b 100644
--- a/app/(main)/professors/[id]/@schedules/page.tsx
+++ b/app/(main)/professors/[id]/@schedules/page.tsx
@@ -12,7 +12,7 @@ const getKey =
   (pageIndex: number, previousPageData: ProfessorsIDSchedulesResponse) => {
     if (previousPageData && previousPageData.page === previousPageData.pages)
       return null;
-    return `/django/core/professors/${id}/schedules/?page=${pageIndex + 1}`;
+    return `/django/core/professors/${id}/schedules?page=${pageIndex + 1}`;
   };
 
 export default function Page({ params }: { params: { id: string } }) {
diff --git a/components/molecules/client/nav-search-bar/component.tsx b/components/molecules/client/nav-search-bar/component.tsx
index 201d86f..133b9cf 100644
--- a/components/molecules/client/nav-search-bar/component.tsx
+++ b/components/molecules/client/nav-search-bar/component.tsx
@@ -1,6 +1,5 @@
 'use client';
 
-import Link from 'next/link';
 import { useSearchParams } from 'next/navigation';
 import useSWR from 'swr';
 
@@ -12,6 +11,7 @@ import {
   SchedulesSearchResponse,
 } from '@/types';
 import SWRConfigProvider from '@/wrappers/swr-config';
+import Link from 'next/link';
 
 type Error = { message: string };
 
@@ -75,6 +75,7 @@ const StatusMessage: React.FC<StatusMessageProps> = ({
 
 const CourseSearchResults: React.FC = () => {
   const searchParams = useSearchParams();
+  const currentOption = searchParams.get('navOption') ?? 'courses';
   const currentQuery = searchParams.get('navQuery') ?? '';
   const { data, error, isLoading } = useCoursesSearchResults(currentQuery);
   return (
@@ -84,7 +85,7 @@ const CourseSearchResults: React.FC = () => {
         ? data.items.map((course, i) => (
             <li key={i} className="border-b-2 border-border last:border-b-0">
               <Link
-                href={`/courses/${course.department}-${course.course_number}`}
+                href={`/courses/${course.department}-${course.course_number}?navOption=${currentOption}`}
                 className="flex flex-col px-lg py-md animation hover:bg-[rgb(var(--color-primary)/0.15)] focus:bg-[rgb(var(--color-primary)/0.15)]"
               >
                 <span className="overflow-ellipsis text-small-lg text-neutral">
@@ -103,6 +104,7 @@ const CourseSearchResults: React.FC = () => {
 
 const ProfessorSearchResults: React.FC = () => {
   const searchParams = useSearchParams();
+  const currentOption = searchParams.get('navOption') ?? 'courses';
   const currentQuery = searchParams.get('navQuery') ?? '';
   const { data, error, isLoading } = useProfessorsSearchResults(currentQuery);
   return (
@@ -112,7 +114,7 @@ const ProfessorSearchResults: React.FC = () => {
         ? data.items.map((professor, i) => (
             <li key={i} className="border-b-2 border-border last:border-b-0">
               <Link
-                href={`/professors/${professor.email.split('@')[0]}`}
+                href={`/professors/${professor.email.split('@')[0]}?navOption=${currentOption}`}
                 className="flex flex-col px-lg py-md animation hover:bg-[rgb(var(--color-primary)/0.15)] focus:bg-[rgb(var(--color-primary)/0.15)]"
               >
                 <span className="overflow-ellipsis text-small-lg text-neutral">
@@ -131,6 +133,7 @@ const ProfessorSearchResults: React.FC = () => {
 
 const ScheduleSearchResults: React.FC = () => {
   const searchParams = useSearchParams();
+  const currentOption = searchParams.get('navOption') ?? 'courses';
   const currentQuery = searchParams.get('navQuery') ?? '';
   const { data, error, isLoading } = useSchedulesSearchResults(currentQuery);
   return (
@@ -140,7 +143,7 @@ const ScheduleSearchResults: React.FC = () => {
         ? data.items.map((schedule, i) => (
             <li key={i} className="border-b-2 border-border last:border-b-0">
               <Link
-                href={`/courses/${schedule.department}-${schedule.course_number}`}
+                href={`/courses/${schedule.department}-${schedule.course_number}?navOption=${currentOption}`}
                 className="flex flex-col px-lg py-md animation hover:bg-[rgb(var(--color-primary)/0.15)] focus:bg-[rgb(var(--color-primary)/0.15)]"
               >
                 <span className="overflow-ellipsis text-small-lg text-neutral">
@@ -184,13 +187,14 @@ export const NavSearchBar: React.FC = () => {
         param="navOption"
         shouldResetPageOnChange={false}
         className="rounded-l-none border-border bg-background"
+        value={currentOption}
       >
         <option value="courses">Courses</option>
         <option value="professors">Professors</option>
         <option value="schedules">Schedules</option>
       </ParamSelect>
       {currentQuery ? (
-        <Card className="absolute left-0 top-[50px] z-50 block w-[500px] max-w-[100dvw] shadow-paper peer-has-[:placeholder-shown]:hidden max-lg:hidden">
+        <Card className="absolute left-0 top-[50px] z-50 hidden w-[500px] max-w-[100dvw] shadow-paper hover:block peer-focus-within:block peer-has-[:placeholder-shown]:hidden max-lg:hidden">
           <SWRConfigProvider>
             {currentOption === 'courses' ? (
               <CourseSearchResults />
diff --git a/components/molecules/param-select/component.tsx b/components/molecules/param-select/component.tsx
index 3b06ebd..bc8b1f7 100644
--- a/components/molecules/param-select/component.tsx
+++ b/components/molecules/param-select/component.tsx
@@ -37,9 +37,15 @@ export const ParamSelect: React.FC<Props> = ({
     replace(`${pathname}?${params.toString()}`);
   }
 
+  React.useEffect(() => {
+    setPendingParam(currentParam);
+  }, [currentParam]);
+
   return (
     <Select
-      disabled={disabled || currentParam !== pendingParam}
+      disabled={
+        disabled || (currentParam !== pendingParam && currentParam !== null)
+      }
       onChange={(e) => handleChange(e.target.value)}
       defaultValue={currentParam ?? ''}
       {...props}
diff --git a/components/molecules/search-bar/component.tsx b/components/molecules/search-bar/component.tsx
index bc61435..10217fb 100644
--- a/components/molecules/search-bar/component.tsx
+++ b/components/molecules/search-bar/component.tsx
@@ -43,6 +43,10 @@ export const SearchBar: React.FC<Props> = ({
     debouncedReplace(`${pathname}?${params.toString()}#${scrollTarget || ''}`);
   }
 
+  React.useEffect(() => {
+    setPendingParam(currentParam);
+  }, [currentParam]);
+
   return (
     <span className={cn('relative', className)} {...props}>
       <TextInput
@@ -53,7 +57,7 @@ export const SearchBar: React.FC<Props> = ({
         defaultValue={currentParam ?? ''}
         className="w-full pl-xxl"
       />
-      {currentParam !== pendingParam ? (
+      {currentParam !== pendingParam && currentParam !== null ? (
         <Spinner className="absolute left-3 top-0 flex h-full items-center" />
       ) : (
         <MagnifyingGlassIcon
diff --git a/utils/fetcher.ts b/utils/fetcher.ts
index eba64f4..6a913b1 100644
--- a/utils/fetcher.ts
+++ b/utils/fetcher.ts
@@ -14,7 +14,6 @@ class FetchError extends Error {
 
 // From the SWR docs
 const fetcher = async (url: string) => {
-  console.log('fetching', url);
   const res = await fetch(url);
   // artificial timeout to see loading state
   // await new Promise((resolve) => setTimeout(resolve, 2000));