diff --git a/frontend/src/app/(site)/company/candidates/candidateCard.tsx b/frontend/src/app/(site)/company/candidates/candidateCard.tsx
index eb0588b..4199732 100644
--- a/frontend/src/app/(site)/company/candidates/candidateCard.tsx
+++ b/frontend/src/app/(site)/company/candidates/candidateCard.tsx
@@ -85,7 +85,7 @@ export const CandidateCard: React.FC<CandidateProps> = ({
               whiteSpace: "nowrap",
             }}
           >
-            {candidate.full_match_score.toFixed(2)}% match
+            {candidate.full_match_score.toFixed(0)}% match
           </div>
         </CardContent>
         <CardContent
diff --git a/frontend/src/app/(site)/company/candidates/page.tsx b/frontend/src/app/(site)/company/candidates/page.tsx
index a0c526d..aa442b5 100644
--- a/frontend/src/app/(site)/company/candidates/page.tsx
+++ b/frontend/src/app/(site)/company/candidates/page.tsx
@@ -17,7 +17,13 @@ const options: IFuseOptions<CandidateForJobList> = {
   shouldSort: true,
   findAllMatches: true,
   threshold: 0,
-  keys: ["job_title", "full_match_score", "soft_skills", "hard_skills", "name"],
+  keys: [
+    "job_title",
+    "full_match_score",
+    "soft_skills",
+    "hard_skills",
+    "preferred_name",
+  ],
 };
 
 export default function CandidatesPage(ctx: any) {
@@ -31,7 +37,10 @@ export default function CandidatesPage(ctx: any) {
   const filteredCandidates = useMemo(() => {
     const fuse = new Fuse(listOfCandidates, options);
     return fuse.search(searchTerm, { limit: 20 });
-  }, [listOfCandidates, searchTerm]);
+  }, [
+    listOfCandidates.sort((a, b) => b.full_match_score - a.full_match_score),
+    searchTerm,
+  ]);
 
   return (
     <Container>
diff --git a/frontend/src/app/(site)/company/jobs/jobPostCard.tsx b/frontend/src/app/(site)/company/jobs/jobPostCard.tsx
index 5507d3f..609650d 100644
--- a/frontend/src/app/(site)/company/jobs/jobPostCard.tsx
+++ b/frontend/src/app/(site)/company/jobs/jobPostCard.tsx
@@ -25,10 +25,10 @@ export const JobPostCard: React.FC<JobPostProps> = ({ job }) => {
   const router = useRouter();
   const handleShowMatchesSubmit = (
     event: FormEvent<HTMLButtonElement>,
-    jobId: string,
+    jobid: string,
   ) => {
     event.preventDefault();
-    router.replace(`/company/candidates/?jobId=${jobId}`);
+    router.replace(`/company/candidates/?jobid=${jobid}`);
   };
 
   const handleViewPostSubmit = (
diff --git a/frontend/src/app/(site)/company/jobs/jobPreview.tsx b/frontend/src/app/(site)/company/jobs/jobPreview.tsx
index 34eabdb..321f9b9 100644
--- a/frontend/src/app/(site)/company/jobs/jobPreview.tsx
+++ b/frontend/src/app/(site)/company/jobs/jobPreview.tsx
@@ -16,7 +16,7 @@ import HomeWorkIcon from "@mui/icons-material/HomeWork";
 import WorkIcon from "@mui/icons-material/Work";
 import PermContactCalendarIcon from "@mui/icons-material/PermContactCalendar";
 import Box from "@mui/material/Box";
-import Tooltip from "@mui/material/Tooltip";
+import { HtmlTooltip } from "@/components/site/candidateProfile/candidateHelpers";
 
 interface JobPreviewInterface {
   jobPost: JobPost;
@@ -36,7 +36,7 @@ export const JobPreview: React.FC<JobPreviewInterface> = ({
     jobId: string,
   ) => {
     event.preventDefault();
-    router.replace(`/company/candidates/?jobId=${jobId}`);
+    router.replace(`/company/candidates/?jobid=${jobId}`);
   };
   return (
     <>
@@ -103,7 +103,22 @@ export const JobPreview: React.FC<JobPreviewInterface> = ({
           >
             Find match
           </Button>
-          <Tooltip title="When you choose a balanced match, you'll still receive the same matching score, but we'll prioritize presenting suggested candidates in a balanced way to support underrepresented groups. It's all about creating a fair and diverse hiring experience">
+          <HtmlTooltip
+            title={
+              <>
+                <Typography color="inherit">
+                  <strong>What is the Balanced Match?</strong>
+                </Typography>
+                <Typography color="inherit">
+                  When you choose a balanced match, you'll still receive the
+                  same matching score, but we'll prioritize presenting suggested
+                  candidates in a balanced way to support underrepresented
+                  groups. It's all about creating a fair and diverse hiring
+                  experience
+                </Typography>
+              </>
+            }
+          >
             <Button
               type="submit"
               variant="outlined"
@@ -117,7 +132,7 @@ export const JobPreview: React.FC<JobPreviewInterface> = ({
             >
               Find balanced match
             </Button>
-          </Tooltip>
+          </HtmlTooltip>
         </ButtonGroup>
       </Stack>
       <Card
diff --git a/frontend/src/components/providers/SignInProvider.tsx b/frontend/src/components/providers/SignInProvider.tsx
index 7bda868..1cb9572 100644
--- a/frontend/src/components/providers/SignInProvider.tsx
+++ b/frontend/src/components/providers/SignInProvider.tsx
@@ -78,7 +78,6 @@ export const SignInProvider: FC<PropsWithChildren> = ({ children }) => {
     if (!auth?.authenticated) {
       return false;
     }
-    //@TODO check token expiration time
     return true;
   };