diff --git a/src/app/api/report-tag/route.ts b/src/app/api/report-tag/route.ts
index 3546942..285e16a 100644
--- a/src/app/api/report-tag/route.ts
+++ b/src/app/api/report-tag/route.ts
@@ -9,29 +9,38 @@ interface ReportedFieldInput {
   field: string;
   value?: string;
 }
+
+interface ReportTagRequestBody {
+  paperId: string;
+  reportedFields?: ReportedFieldInput[];
+  comment?: string;
+  reporterEmail?: string;
+  reporterId?: string;
+}
+
 const ALLOWED_FIELDS = ["subject", "courseCode", "exam", "slot", "year"];
 
 const ratelimit = new Ratelimit({
   redis,
-  limiter: Ratelimit.slidingWindow(3, "1 h"),//per id - 3 request - per hour
+  limiter: Ratelimit.slidingWindow(3, "1 h"), //per id - 3 request - per hour
   analytics: true,
 });
 
-function getClientIp(req: Request & { ip?: string}): string {
-  return req.ip || "127.0.0.1";
+function getClientIp(req: Request & { ip?: string }): string {
+  return req.ip ?? "127.0.0.1";
 }
 
 export async function POST(req: Request & { ip?: string }) {
   try {
     await connectToDatabase();
 
-    const body = await req.json();
+    const body = (await req.json()) as ReportTagRequestBody;
     const { paperId } = body;
 
     if (!paperId) {
       return NextResponse.json(
         { error: "paperId is required" },
-        { status: 400 }
+        { status: 400 },
       );
     }
     const ip = getClientIp(req);
@@ -41,39 +50,42 @@ export async function POST(req: Request & { ip?: string }) {
     if (!success) {
       return NextResponse.json(
         { error: "Rate limit exceeded for reporting." },
-        { status: 429 }
+        { status: 429 },
       );
     }
-    const MAX_REPORTS_PER_PAPER = 5; 
+    const MAX_REPORTS_PER_PAPER = 5;
     const count = await TagReport.countDocuments({ paperId });
 
     if (count >= MAX_REPORTS_PER_PAPER) {
       return NextResponse.json(
         { error: "Received many reports; we are currently working on it." },
-        { status: 429 }
+        { status: 429 },
       );
     }
-      const reportedFields: ReportedFieldInput[] = Array.isArray(body.reportedFields)
-        ? body.reportedFields
-            .map((r:Partial<ReportedFieldInput>) => ({
-              field: typeof r.field === "string" ? r.field.trim() : "",
-              value: typeof r.value === "string" ? r.value.trim() : undefined,
-            }))
-            .filter((r:Partial<ReportedFieldInput>) => r.field)
-        : [];
+
+    const reportedFields: ReportedFieldInput[] = Array.isArray(
+      body.reportedFields,
+    )
+      ? body.reportedFields
+          .map((r: Partial<ReportedFieldInput>) => ({
+            field: typeof r.field === "string" ? r.field.trim() : "",
+            value: typeof r.value === "string" ? r.value.trim() : undefined,
+          }))
+          .filter((r: Partial<ReportedFieldInput>) => r.field)
+      : [];
 
     for (const rf of reportedFields) {
       if (!ALLOWED_FIELDS.includes(rf.field)) {
         return NextResponse.json(
           { error: `Invalid field: ${rf.field}` },
-          { status: 400 }
+          { status: 400 },
         );
       }
       if (rf.field === "exam" && rf.value) {
-        if (!exams.some(e => e.toLowerCase() === rf.value?.toLowerCase())) {
+        if (!exams.some((e) => e.toLowerCase() === rf.value?.toLowerCase())) {
           return NextResponse.json(
             { error: `Invalid exam value: ${rf.value}` },
-            { status: 400 }
+            { status: 400 },
           );
         }
       }
@@ -89,13 +101,13 @@ export async function POST(req: Request & { ip?: string }) {
 
     return NextResponse.json(
       { message: "Report submitted.", report: newReport },
-      { status: 201 }
+      { status: 201 },
     );
   } catch (err) {
     console.error(err);
     return NextResponse.json(
       { error: "Failed to submit tag report." },
-      { status: 500 }
+      { status: 500 },
     );
   }
 }
diff --git a/src/components/Footer.tsx b/src/components/Footer.tsx
index 3c8094f..054b28d 100644
--- a/src/components/Footer.tsx
+++ b/src/components/Footer.tsx
@@ -15,6 +15,12 @@ import {
 } from "react-icons/fa6";
 import { Bold, Mail } from "lucide-react";
 import toast from "react-hot-toast";
+
+type SubscribeResponse = {
+  message?: string;
+  error?: string;
+};
+
 export default function Footer() {
   const { theme } = useTheme();
   const [isDarkMode, setIsDarkMode] = useState<boolean | null>(true);
@@ -35,16 +41,22 @@ export default function Footer() {
         method: "POST",
         headers: { "Content-Type": "application/json" },
         body: JSON.stringify({ email }),
-      })
-      .then(async (res) => {
-        const data = await res.json();
-        if (!res.ok) return Promise.reject(data.error || "Something went wrong.");
+      }).then(async (res) => {
+        const data = (await res.json()) as SubscribeResponse;
+
+        if (!res.ok) {
+          return Promise.reject(
+            new Error(data.error ?? "Something went wrong."),
+          );
+        }
+
         return data;
       }),
       {
         loading: "Subscribing...",
         success: "You've Successfully Subscribed!",
-        error: (err: any) => err,
+        error: (err: unknown) =>
+          err instanceof Error ? err.message : String(err),
       },
     );
 
@@ -52,8 +64,8 @@ export default function Footer() {
   };
 
   return (
-    <footer className="w-full overflow-hidden bg-gradient-to-b from-[#F3F5FF] to-[#A599CE] px-6 py-10 pt-16 md:pt-20 lg:pt-36 text-white dark:from-[#070114] dark:to-[#1F0234]">
-      <div className="mx-auto flex max-w-7xl flex-col lg:flex-row justify-between gap-y-10 text-center lg:text-left mb-16">
+    <footer className="w-full overflow-hidden bg-gradient-to-b from-[#F3F5FF] to-[#A599CE] px-6 py-10 pt-16 text-white dark:from-[#070114] dark:to-[#1F0234] md:pt-20 lg:pt-36">
+      <div className="mx-auto mb-16 flex max-w-7xl flex-col justify-between gap-y-10 text-center lg:flex-row lg:text-left">
         {/* Branding & Socials */}
         <div className="flex w-full flex-col gap-4 lg:w-[30%]">
           <h1 className="bg-gradient-to-r from-[#562EE7] to-[rgba(116,128,255,0.8)] bg-clip-text font-jost text-5xl font-bold text-transparent dark:to-[#FFC6E8]">
@@ -96,33 +108,42 @@ export default function Footer() {
         </div>
 
         {/* Events */}
-        <div className="flex w-full flex-col gap-2 text-black dark:text-white  lg:w-[15%]">
+        <div className="flex w-full flex-col gap-2 text-black dark:text-white lg:w-[15%]">
           <h3 className="font-jost text-xl font-semibold">Events</h3>
-          <Link href="https://devsoc25.codechefvit.com" target="_blank">DevSoc</Link>
-          <Link href="https://gravitas.codechefvit.com" target="_blank">CookOff</Link>
-          <Link href="https://gravitas.codechefvit.com" target="_blank">Clueminati</Link>
+          <Link href="https://devsoc25.codechefvit.com" target="_blank">
+            DevSoc
+          </Link>
+          <Link href="https://gravitas.codechefvit.com" target="_blank">
+            CookOff
+          </Link>
+          <Link href="https://gravitas.codechefvit.com" target="_blank">
+            Clueminati
+          </Link>
         </div>
         {/* Projects */}
-        <div className="flex w-full flex-col gap-2 text-black dark:text-white  lg:w-[20%]">
+        <div className="flex w-full flex-col gap-2 text-black dark:text-white lg:w-[20%]">
           <h3 className="font-jost text-xl font-semibold">Our Projects</h3>
-          <Link href="https://papers.codechefvit.com" target="_blank">Papers</Link>
-          <Link href="https://contactify.codechefvit.com" target="_blank">Contactify</Link>
-          <Link href="https://ffcs.codechefvit.com" target="_blank">FFCS-inator</Link>
+          <Link href="https://papers.codechefvit.com" target="_blank">
+            Papers
+          </Link>
+          <Link href="https://contactify.codechefvit.com" target="_blank">
+            Contactify
+          </Link>
+          <Link href="https://ffcs.codechefvit.com" target="_blank">
+            FFCS-inator
+          </Link>
         </div>
 
         {/* Suggestions */}
-        <div className="flex w-full flex-col gap-1 text-black dark:text-white lg:w-[25%] items-center lg:items-start">
+        <div className="flex w-full flex-col items-center gap-1 text-black dark:text-white lg:w-[25%] lg:items-start">
           <Link
             href={`mailto:codechefvit@gmail.com`}
-            className="flex items-center gap-2 font-jost text-xl font-semibold mb-2"
+            className="mb-2 flex items-center gap-2 font-jost text-xl font-semibold"
           >
-            <Mail size={20} 
-              fontWeight="Bold"
-            />
+            <Mail size={20} fontWeight="Bold" />
             <span>codechefvit@gmail.com</span>
           </Link>
 
-
           <h3 className="my-2 font-jost text-xl font-semibold">
             Subscribe For Updates:
           </h3>
diff --git a/src/components/ReportTagModal.tsx b/src/components/ReportTagModal.tsx
index 4ea755a..dc9a758 100644
--- a/src/components/ReportTagModal.tsx
+++ b/src/components/ReportTagModal.tsx
@@ -15,7 +15,7 @@ import { MultiSelect } from "@/components/multi-select";
 import LabeledInput from "@/components/ui/LabeledInput";
 import LabeledSelect from "@/components/ui/LabeledSelect";
 import axios from "axios";
-import toast from "react-hot-toast";  
+import toast from "react-hot-toast";
 
 interface ReportTagModalProps {
   paperId: string;
@@ -40,8 +40,9 @@ const ReportTagModal = ({
   const [internalOpen, setInternalOpen] = useState(false);
   const isControlled = open !== undefined && setOpen !== undefined;
 
-  const modalOpen = isControlled ? open! : internalOpen;
-  const modalSetOpen = isControlled ? setOpen! : setInternalOpen;
+  const modalOpen = isControlled ? open : internalOpen;
+  const modalSetOpen = isControlled ? setOpen : setInternalOpen;
+
   const [comment, setComment] = useState("");
   const [email, setEmail] = useState("");
   const [selectedCategories, setSelectedCategories] = useState<string[]>([]);
@@ -64,26 +65,27 @@ const ReportTagModal = ({
   const isDirty = useMemo(() => {
     if (selectedCategories.length === 0) return false;
     for (const c of selectedCategories) {
-      const curr = (categoryValues[c] || "").trim();
-      const orig = (originalCategoryValues[c] || "").trim();
+      const curr = (categoryValues[c] ?? "").trim();
+      const orig = (originalCategoryValues[c] ?? "").trim();
       if (curr !== orig) return true;
     }
 
     if (selectedCategories.includes("subject")) {
-      const currCode = (categoryValues["courseCode"] || "").trim();
-      const origCode = (originalCategoryValues["courseCode"] || "").trim();
+      const currCode = (categoryValues.courseCode ?? "").trim();
+      const origCode = (originalCategoryValues.courseCode ?? "").trim();
       if (currCode !== origCode) return true;
     }
 
     return false;
   }, [selectedCategories, categoryValues, originalCategoryValues]);
-     const canSubmit = isDirty || comment.trim().length > 0;
+  const canSubmit = isDirty ?? comment.trim().length > 0;
 
   useEffect(() => {
     for (const c of selectedCategories) {
       if (categoryValues[c]) continue;
       if (c === "subject" && subject) {
-        const m = subject.match(/^(.*)\s*\[([^\]]+)\]\s*$/);
+        const regex = /^(.*)\s*\[([^\]]+)\]\s*$/;
+        const m = regex.exec(subject);
         if (m?.[1] && m?.[2]) {
           const name = m[1].trim();
           const code = m[2].trim();
@@ -104,17 +106,20 @@ const ReportTagModal = ({
     if (open) {
       const base: Record<string, string> = {};
       if (subject) {
-        const m = subject.match(/^(.*)\s*\[([^\]]+)\]\s*$/);
+        const regex = /^(.*)\s*\[([^\]]+)\]\s*$/;
+        const m = regex.exec(subject);
+
         if (m?.[1] && m?.[2]) {
-          base["subject"] = m[1].trim();
-          base["courseCode"] = m[2].trim();
+          base.subject = m[1].trim();
+          base.courseCode = m[2].trim();
         } else {
-          base["subject"] = subject;
+          base.subject = subject;
         }
       }
-      if (exam) base["exam"] = exam;
-      if (slot) base["slot"] = slot;
-      if (year) base["year"] = year;
+
+      if (exam) base.exam = exam;
+      if (slot) base.slot = slot;
+      if (year) base.year = year;
       setOriginalCategoryValues(base);
       setOriginalEmail("");
     } else {
@@ -128,119 +133,127 @@ const ReportTagModal = ({
   }, [open, subject, exam, slot, year]);
 
   const handleSubmit = async () => {
-  if (!paperId) {
-    toast.error("Missing paper id.");
-    return;
-  }
-
-  if (selectedCategories.includes("subject")) {
-  const sub = (categoryValues.subject || "").trim();
-  if (!sub) {
-    toast.error("Subject name cannot be empty.");
-    return;
-  }
-}
-
-  if (selectedCategories.includes("slot")) {
-    const v = (categoryValues.slot || "").trim();
-    const slotRegex = /^[A-G][1-2]$/;
-    if (!slotRegex.test(v)) {
-      toast.error("Slot must be from A1 to G2 (e.g., D1, B2).");
+    if (!paperId) {
+      toast.error("Missing paper id.");
       return;
     }
-  }
-  if (selectedCategories.includes("year")) {
-    const y = (categoryValues.year || "").trim();
-    const yearRegex = /^\d{4}(-\d{4})?$/;
-    if (!yearRegex.test(y)) {
-      toast.error("Year must be a valid format (e.g., 2024 or 2024-2025).");
-      return;
+
+    if (selectedCategories.includes("subject")) {
+      const sub = (categoryValues.subject ?? "").trim();
+      if (!sub) {
+        toast.error("Subject name cannot be empty.");
+        return;
+      }
     }
-    if (y.includes("-")) {
-    const parts = y.split("-");
-    const start = Number(parts[0]);
-    const end = Number(parts[1]);
-    
-    if (isNaN(start) || isNaN(end)) {
-      toast.error("Invalid year format.");
-      return;
+
+    if (selectedCategories.includes("slot")) {
+      const v = (categoryValues.slot ?? "").trim();
+      const slotRegex = /^[A-G][1-2]$/;
+      if (!slotRegex.test(v)) {
+        toast.error("Slot must be from A1 to G2 (e.g., D1, B2).");
+        return;
+      }
     }
-    if (end - start !== 1) {
-      toast.error("Year range difference must be exactly 1 (e.g., 2024-2025).");
-      return;
+    if (selectedCategories.includes("year")) {
+      const y = (categoryValues.year ?? "").trim();
+      const yearRegex = /^\d{4}(-\d{4})?$/;
+      if (!yearRegex.test(y)) {
+        toast.error("Year must be a valid format (e.g., 2024 or 2024-2025).");
+        return;
+      }
+      if (y.includes("-")) {
+        const parts = y.split("-");
+        const start = Number(parts[0]);
+        const end = Number(parts[1]);
+
+        if (isNaN(start) ?? isNaN(end)) {
+          toast.error("Invalid year format.");
+          return;
+        }
+        if (end - start !== 1) {
+          toast.error(
+            "Year range difference must be exactly 1 (e.g., 2024-2025).",
+          );
+          return;
+        }
+      }
     }
-  }
-  }
     if (email.trim() && !email.includes("@gmail.com")) {
-    toast.error("Email must be a valid Gmail address (@gmail.com).");
-    return;
-  }
+      toast.error("Email must be a valid Gmail address (@gmail.com).");
+      return;
+    }
+
+    const reportedFields: { field: string; value?: string }[] = [];
 
-  const reportedFields: { field: string; value?: string }[] = [];
+    for (const c of selectedCategories) {
+      if (c === "subject") {
+        const newSub = (categoryValues.subject ?? "").trim();
+        const oldSub = (originalCategoryValues.subject ?? "").trim();
 
-  for (const c of selectedCategories) {
-    if (c === "subject") {
-      const newSub = (categoryValues.subject || "").trim();
-      const oldSub = (originalCategoryValues.subject || "").trim();
+        if (newSub !== oldSub) {
+          reportedFields.push({ field: "subject", value: newSub });
+        }
 
-      if (newSub !== oldSub) {
-        reportedFields.push({ field: "subject", value: newSub });
-      }
+        const newCode = (categoryValues.courseCode ?? "").trim();
+        const oldCode = (originalCategoryValues.courseCode ?? "").trim();
 
-      const newCode = (categoryValues.courseCode || "").trim();
-      const oldCode = (originalCategoryValues.courseCode || "").trim();
+        if (newCode !== oldCode) {
+          reportedFields.push({ field: "courseCode", value: newCode });
+        }
 
-      if (newCode !== oldCode) {
-        reportedFields.push({ field: "courseCode", value: newCode });
+        continue;
       }
 
-      continue;
-    }
-
-    const newVal = (categoryValues[c] || "").trim();
-    const oldVal = (originalCategoryValues[c] || "").trim();
+      const newVal = (categoryValues[c] ?? "").trim();
+      const oldVal = (originalCategoryValues[c] ?? "").trim();
 
-    if (newVal !== oldVal) {
-      reportedFields.push({ field: c, value: newVal });
+      if (newVal !== oldVal) {
+        reportedFields.push({ field: c, value: newVal });
+      }
     }
-  }
 
-if (reportedFields.length === 0 && comment.trim().length === 0) {
-  toast.error("Please change a tag or write a comment.");
-  return;
-}
-  const payload = {
-    paperId,
-    reportedFields,
-    comment,
-    reporterEmail: email || undefined,
-  };
-  setLoading(true);
-  await toast.promise(
-    axios.post("/api/report-tag", payload),
-    {
-      loading: "Submitting your report...",
-      success: "Reported successfully. Thank you, We will work on that",
-      error: (err)=>{
-        return (
-        err?.response?.data?.error ||
-        err?.message ||
-        "Failed to submit report."
-        )
-      },
+    if (reportedFields.length === 0 && comment.trim().length === 0) {
+      toast.error("Please change a tag or write a comment.");
+      return;
     }
-  )
-  .then(() => {
-      modalSetOpen(false);
-      setComment("");
-      setEmail("");
-      setSelectedCategories([]);
-      setCategoryValues({});
-    })
-  .finally(() => {
-      setLoading(false);
-    });
-};
+    const payload = {
+      paperId,
+      reportedFields,
+      comment,
+      reporterEmail: email ?? undefined,
+    };
+    setLoading(true);
+    await toast
+      .promise(axios.post("/api/report-tag", payload), {
+        loading: "submitting your report...",
+        success: "reported successfully",
+        error: (err: unknown) => {
+          if (axios.isAxiosError(err)) {
+            return (
+              (err.response?.data as { error?: string })?.error ??
+              err.message ??
+              "failed to submit report"
+            );
+          }
+
+          if (err instanceof Error) {
+            return err.message;
+          }
+
+          return "failed to submit report";
+        },
+      })
+      .then(() => {
+        modalSetOpen(false);
+        setComment("");
+        setEmail("");
+        setSelectedCategories([]);
+        setCategoryValues({});
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  };
 
   return (
     <Dialog open={modalOpen} onOpenChange={modalSetOpen}>
@@ -254,7 +267,7 @@ if (reportedFields.length === 0 && comment.trim().length === 0) {
 
       <DialogContent className={contentClass}>
         <DialogHeader>
-         <div className="flex items-center gap-2">
+          <div className="flex items-center gap-2">
             <DialogTitle>Report Wrong Tags</DialogTitle>
             <FaFlag className="text-lg" aria-hidden="true" />
           </div>
@@ -276,120 +289,131 @@ if (reportedFields.length === 0 && comment.trim().length === 0) {
                 { label: "Slot", value: "slot" },
                 { label: "Year", value: "year" },
               ]}
-              onValueChange={(vals:string[]) => setSelectedCategories(vals)}
+              onValueChange={(vals: string[]) => setSelectedCategories(vals)}
               defaultValue={[]}
               placeholder="Select fields"
             />
           </div>
 
           {selectedCategories.length > 0 && (
-                          <div>
-                <label className="mb-2 block text-sm font-medium">Correct values</label>
-
-                <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
-              {selectedCategories.map((c) => {
-              if (c === "subject") {
-                return (
-                  <div key={c} className="w-full space-y-2">
-                    <LabeledInput
-                      label="Subject name"
-                      value={categoryValues.subject ?? ""}
-                      onChange={(v) => setCategoryValues((s) => ({ ...s, subject: v }))}
-                      placeholder="Subject name"
-                    />
+            <div>
+              <label className="mb-2 block text-sm font-medium">
+                Correct values
+              </label>
+
+              <div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
+                {selectedCategories.map((c) => {
+                  if (c === "subject") {
+                    return (
+                      <div key={c} className="w-full space-y-2">
+                        <LabeledInput
+                          label="Subject name"
+                          value={categoryValues.subject ?? ""}
+                          onChange={(v) =>
+                            setCategoryValues((s) => ({ ...s, subject: v }))
+                          }
+                          placeholder="Subject name"
+                        />
+                        <LabeledInput
+                          label="Course code"
+                          value={categoryValues.courseCode ?? ""}
+                          onChange={(v) =>
+                            setCategoryValues((s) => ({ ...s, courseCode: v }))
+                          }
+                          placeholder="e.g. BMAT205L"
+                        />
+                      </div>
+                    );
+                  }
+
+                  if (c === "exam") {
+                    return (
+                      <LabeledSelect
+                        key={c}
+                        label="Exam"
+                        value={categoryValues.exam ?? ""}
+                        onChange={(v) =>
+                          setCategoryValues((s) => ({ ...s, exam: v }))
+                        }
+                        options={["CAT-1", "CAT-2", "FAT"]}
+                        placeholder="Select exam"
+                      />
+                    );
+                  }
+
+                  if (c === "slot") {
+                    return (
+                      <LabeledInput
+                        key={c}
+                        label="Slot"
+                        value={categoryValues.slot ?? ""}
+                        onChange={(v) =>
+                          setCategoryValues((s) => ({
+                            ...s,
+                            slot: v.toUpperCase().replace(/[^A-Z0-9]/g, ""),
+                          }))
+                        }
+                        placeholder="e.g. D1"
+                        maxLength={2}
+                      />
+                    );
+                  }
+
+                  if (c === "year") {
+                    return (
+                      <LabeledInput
+                        key={c}
+                        label="Year"
+                        value={categoryValues.year ?? ""}
+                        onChange={(v) =>
+                          setCategoryValues((s) => ({ ...s, year: v }))
+                        }
+                        placeholder="e.g. 2024-2025"
+                      />
+                    );
+                  }
+
+                  return (
                     <LabeledInput
-                      label="Course code"
-                      value={categoryValues.courseCode ?? ""}
-                      onChange={(v) => setCategoryValues((s) => ({ ...s, courseCode: v }))}
-                      placeholder="e.g. BMAT205L"
+                      key={c}
+                      label={c}
+                      value={categoryValues[c] ?? ""}
+                      onChange={(v) =>
+                        setCategoryValues((s) => ({ ...s, [c]: v }))
+                      }
                     />
-                  </div>
-                );
-              }
-
-              if (c === "exam") {
-                return (
-                  <LabeledSelect
-                    key={c}
-                    label="Exam"
-                    value={categoryValues.exam ?? ""}
-                    onChange={(v) => setCategoryValues((s) => ({ ...s, exam: v }))}
-                    options={["CAT-1", "CAT-2", "FAT"]}
-                    placeholder="Select exam"
-                  />
-                );
-              }
-
-              if (c === "slot") {
-                return (
-                  <LabeledInput
-                    key={c}
-                    label="Slot"
-                    value={categoryValues.slot ?? ""}
-                    onChange={(v) =>
-                      setCategoryValues((s) => ({
-                        ...s,
-                        slot: v.toUpperCase().replace(/[^A-Z0-9]/g, ""),
-                      }))
-                    }
-                    placeholder="e.g. D1"
-                    maxLength={2}
-                  />
-                );
-              }
-
-              if (c === "year") {
-                return (
-                  <LabeledInput
-                    key={c}
-                    label="Year"
-                    value={categoryValues.year ?? ""}
-                    onChange={(v) => setCategoryValues((s) => ({ ...s, year: v }))}
-                    placeholder="e.g. 2024-2025"
-                  />
-                );
-              }
-
-              return (
-                <LabeledInput
-                  key={c}
-                  label={c}
-                  value={categoryValues[c] ?? ""}
-                  onChange={(v) => setCategoryValues((s) => ({ ...s, [c]: v }))}
-                />
-              );
-            })}
-                </div>
+                  );
+                })}
               </div>
-            )}
-
-                <LabeledInput
-                  label="Comment (optional)"
-                  value={comment}
-                  onChange={setComment}
-                  placeholder="Describe the issue clearly (e.g., pages torn, print faded, incorrect paper, missing sections)"
-                />
-
-                <LabeledInput
-                  label="Your email (optional)"
-                  value={email}
-                  onChange={setEmail}
-                  placeholder="you@example.com"
-                  type="email"
-                />
-                {!canSubmit &&(<p className="text-xs text-gray-500 dark:text-red-400">
-                      Submit button becomes active only if you update a tag or write a comment.
-                </p>)}
-
-                <div className="flex justify-end">
-                  <Button
-                    onClick={handleSubmit}
-                    disabled={!canSubmit || loading}
-                  >
-                    Submit
-                  </Button>
-                </div>
-
+            </div>
+          )}
+
+          <LabeledInput
+            label="Comment (optional)"
+            value={comment}
+            onChange={setComment}
+            placeholder="Describe the issue clearly (e.g., pages torn, print faded, incorrect paper, missing sections)"
+          />
+
+          <LabeledInput
+            label="Your email (optional)"
+            value={email}
+            onChange={setEmail}
+            placeholder="you@example.com"
+            type="email"
+          />
+          {!canSubmit && (
+            <p className="text-xs text-gray-500 dark:text-red-400">
+              Submit button becomes active only if you update a tag or write a
+              comment.
+            </p>
+          )}
+
+          <div className="flex justify-end">
+            <Button onClick={handleSubmit} disabled={!canSubmit || loading}>
+              Submit
+            </Button>
+          </div>
         </div>
       </DialogContent>
     </Dialog>
diff --git a/src/components/ui/LabeledSelect.tsx b/src/components/ui/LabeledSelect.tsx
index 0ebd2e8..7afa078 100644
--- a/src/components/ui/LabeledSelect.tsx
+++ b/src/components/ui/LabeledSelect.tsx
@@ -2,7 +2,13 @@
 
 import React from "react";
 import { Field } from "@/components/ui/field";
-import { Select, SelectTrigger, SelectContent, SelectValue, SelectItem } from "@/components/ui/select";
+import {
+  Select,
+  SelectTrigger,
+  SelectContent,
+  SelectValue,
+  SelectItem,
+} from "@/components/ui/select";
 
 interface LabeledSelectProps {
   label: string;
@@ -12,12 +18,18 @@ interface LabeledSelectProps {
   placeholder?: string;
 }
 
-const LabeledSelect = ({ label, value, onChange, options, placeholder }: LabeledSelectProps) => {
+const LabeledSelect = ({
+  label,
+  value,
+  onChange,
+  options,
+  placeholder,
+}: LabeledSelectProps) => {
   return (
     <Field label={label}>
       <Select value={value} onValueChange={onChange}>
         <SelectTrigger className="w-full">
-          <SelectValue placeholder={placeholder || "Select"} />
+          <SelectValue placeholder={placeholder ?? "Select"} />
         </SelectTrigger>
         <SelectContent>
           {options.map((opt) => (
diff --git a/src/components/ui/field.tsx b/src/components/ui/field.tsx
index 30e880f..fb8f8bb 100644
--- a/src/components/ui/field.tsx
+++ b/src/components/ui/field.tsx
@@ -1,12 +1,16 @@
 import { Label } from "@/components/ui/label";
 
-export function Field({ label, children, className }: {
+export function Field({
+  label,
+  children,
+  className,
+}: {
   label: string;
   children: React.ReactNode;
   className?: string;
 }) {
   return (
-    <div className={`space-y-1 w-full ${className || ""}`}>
+    <div className={`w-full space-y-1 ${className ?? ""}`}>
       <Label>{label}</Label>
       {children}
     </div>
diff --git a/src/context/filterContext.tsx b/src/context/filterContext.tsx
index 7ab6bb0..daf32d0 100644
--- a/src/context/filterContext.tsx
+++ b/src/context/filterContext.tsx
@@ -159,7 +159,7 @@ export const FilterProvider: React.FC<FilterProviderProps> = ({
     const url = URL.createObjectURL(zipBlob);
     const a = document.createElement("a");
     a.href = url;
-    a.download = searchParams.get("subject")?.split(" [")[0];
+    a.download = searchParams.get("subject")?.split(" [")[0] ?? "papers";
     document.body.appendChild(a);
     a.click();
     a.remove();