diff --git a/vocodes/src/jobs/TtsInferenceJobs.ts b/vocodes/src/jobs/TtsInferenceJobs.ts
index 386c81de3d..e0b4f0df43 100644
--- a/vocodes/src/jobs/TtsInferenceJobs.ts
+++ b/vocodes/src/jobs/TtsInferenceJobs.ts
@@ -19,8 +19,12 @@ export class TtsInferenceJob {
     this.status = status;
     this.jobToken = jobToken;
     this.maybeResultToken = maybeResulToken;
-    this.modelToken = modelToken;
-    this.title = title;
+    if (!!modelToken) {
+      this.modelToken = modelToken;
+    }
+    if (!!title) {
+      this.title = title;
+    }
     this.maybePublicBucketWavAudioPath = maybePublicBucketWavAudioPath;
   }
 
diff --git a/vocodes/src/jobs/TtsModelUploadJobs.ts b/vocodes/src/jobs/TtsModelUploadJobs.ts
index 1caf3f6cc0..5d44bbbc56 100644
--- a/vocodes/src/jobs/TtsModelUploadJobs.ts
+++ b/vocodes/src/jobs/TtsModelUploadJobs.ts
@@ -2,17 +2,17 @@
 
 export class TtsModelUploadJob {
   jobToken: string;
-  maybeModelToken?: string;
+  maybeModelToken: string | undefined | null;
   status: string;
 
   constructor(
     jobToken: string, 
     status: string = 'unknown',
-    maybeModelToken?: string 
+    maybeModelToken: string | undefined | null = undefined
   ) {
     this.status = status;
     this.jobToken = jobToken;
-    if (maybeModelToken !== undefined) {
+    if (!!maybeModelToken) {
       this.maybeModelToken = maybeModelToken;
     }
   }
@@ -34,7 +34,7 @@ export interface TtsModelUploadJobStateResponsePayload {
 export interface TtsInferenceJobState {
   job_token: string,
   status: string,
-  maybe_model_token?: string,
+  maybe_model_token: string | undefined | null,
   created_at: string,
   updated_at: string,
 }
diff --git a/vocodes/src/jobs/W2lInferenceJobs.ts b/vocodes/src/jobs/W2lInferenceJobs.ts
index c65b7f4b8a..c3d5890cdb 100644
--- a/vocodes/src/jobs/W2lInferenceJobs.ts
+++ b/vocodes/src/jobs/W2lInferenceJobs.ts
@@ -1,25 +1,27 @@
 
 export class W2lInferenceJob {
   jobToken: string;
-  maybeW2lTemplateToken?: string;
+  maybeW2lTemplateToken: string | undefined | null;
   status: string;
   title?: string;
-  maybeResultToken?: string;
-  maybePublicBucketVideoPath?: string;
+  maybeResultToken: string | undefined | null;
+  maybePublicBucketVideoPath: string | undefined | null;
 
   constructor(
     jobToken: string, 
     status: string = 'unknown',
-    maybeW2lTemplateToken: string | undefined = undefined,
+    maybeW2lTemplateToken: string | undefined | null = undefined,
     title: string | undefined = undefined,
-    maybeResulToken: string | undefined = undefined,
-    maybePublicBucketVideoPath: string | undefined = undefined,
+    maybeResulToken: string | undefined | null = undefined,
+    maybePublicBucketVideoPath: string | undefined | null = undefined,
   ) {
     this.status = status;
     this.jobToken = jobToken;
     this.maybeResultToken = maybeResulToken;
     this.maybeW2lTemplateToken = maybeW2lTemplateToken;
-    this.title = title;
+    if (!!title) {
+      this.title = title;
+    }
     this.maybePublicBucketVideoPath = maybePublicBucketVideoPath;
   }
 
@@ -43,9 +45,9 @@ export interface W2lInferenceJobStateResponsePayload {
 export interface W2lInferenceJobState {
   job_token: string,
   status: string,
-  maybe_result_token?: string,
-  maybe_public_bucket_video_path?: string,
-  maybe_w2l_template_token?: string,
+  maybe_result_token: string | undefined | null,
+  maybe_public_bucket_video_path: string | undefined | null,
+  maybe_w2l_template_token: string | undefined | null,
   w2l_template_type: string,
   title: string,
   created_at: string,
diff --git a/vocodes/src/jobs/W2lTemplateUploadJobs.ts b/vocodes/src/jobs/W2lTemplateUploadJobs.ts
index 82e437e694..422068a3cd 100644
--- a/vocodes/src/jobs/W2lTemplateUploadJobs.ts
+++ b/vocodes/src/jobs/W2lTemplateUploadJobs.ts
@@ -3,16 +3,16 @@
 export class W2lTemplateUploadJob {
   jobToken: string;
   status: string;
-  maybeW2lTemplateToken?: string;
+  maybeW2lTemplateToken: string | undefined | null;
 
   constructor(
     jobToken: string, 
     status: string = 'unknown',
-    maybeW2lTemplateToken?: string
+    maybeW2lTemplateToken: string | undefined | null = null
   ) {
     this.status = status;
     this.jobToken = jobToken;
-    if (maybeW2lTemplateToken !== undefined) {
+    if (!!maybeW2lTemplateToken) {
       this.maybeW2lTemplateToken = maybeW2lTemplateToken;
     }
   }
@@ -33,7 +33,7 @@ export interface W2lTemplateUploadJobStateResponsePayload {
 
 export interface W2lTemplateUploadJobState {
   job_token: string,
-  maybe_template_token?: string,
+  maybe_template_token: string | null,
   status: string,
   created_at: string,
   updated_at: string,
diff --git a/vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx b/vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx
index 85945fce5e..41572413df 100644
--- a/vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx
+++ b/vocodes/src/v2/common/SessionTtsInferenceResultsListFc.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link, Switch, Route } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { TtsInferenceJob } from '../../App'
 
 interface Props {
diff --git a/vocodes/src/v2/common/SessionW2lInferenceResultsListFc.tsx b/vocodes/src/v2/common/SessionW2lInferenceResultsListFc.tsx
index bd10a6204c..b64a091bdd 100644
--- a/vocodes/src/v2/common/SessionW2lInferenceResultsListFc.tsx
+++ b/vocodes/src/v2/common/SessionW2lInferenceResultsListFc.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { Link, Switch, Route } from 'react-router-dom';
+import { Link } from 'react-router-dom';
 import { W2lInferenceJob } from '../../App'
 
 interface Props {