diff --git a/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs b/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs
index 69a729bcd..8f71f225f 100644
--- a/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs
+++ b/Source/Applications/SystemCenterNotification/Controllers/EmailTypeController.cs
@@ -493,11 +493,13 @@ private List<TimelineItem> GetEmailTimeline(PostData postData, int SentEmailID)
 
                 id++;
 
+                FileGroupAnalysisJob fileGroupAnalysisJobRecord = new TableOperations<FileGroupAnalysisJob>(connection).QueryRecord("ProcessingVersion DESC", new RecordRestriction("FileGroupID = {0}", fileGroupRecord.ID));
+
                 timeline.Add(new TimelineItem()
                 {
                     Description = "File Group Processing",
-                    Start = fileGroupRecord.ProcessingStartTime,
-                    End = fileGroupRecord.ProcessingEndTime,
+                    Start = fileGroupAnalysisJobRecord.ProcessingStartTime,
+                    End = fileGroupAnalysisJobRecord.ProcessingEndTime,
                     ID = id
                 });
 
@@ -520,7 +522,7 @@ private List<TimelineItem> GetEmailTimeline(PostData postData, int SentEmailID)
                     id++;
                 }
 
-                DataOperationFailure[] dataOperationFailureRecords = new TableOperations<DataOperationFailure>(connection).QueryRecordsWhere("FileGroupID = {0}", fileGroupRecord.ID).ToArray();
+                DataOperationFailure[] dataOperationFailureRecords = new TableOperations<DataOperationFailure>(connection).QueryRecordsWhere("FileGroupAnalysisJobID = {0}", fileGroupAnalysisJobRecord.ID).ToArray();
 
                 foreach (DataOperationFailure dataOperationFailure in dataOperationFailureRecords)
                 {
diff --git a/Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailCategoryPage.tsx b/Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailCategoryPage.tsx
index ae2f3674e..5b8de2bd1 100644
--- a/Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailCategoryPage.tsx
+++ b/Source/Applications/SystemCenterNotification/Scripts/TSX/EmailCategory/EmailCategoryPage.tsx
@@ -105,7 +105,7 @@ const EmailCategoryPage = (props: IProps) => {
                     CallBack={(conf) => {
                         if (conf) {
                             dispatch(EmailCategorySlice.DBAction({ verb: 'DELETE', record: category }));
-                            window.location.href = `${homePath}/Categories`;
+                            window.location.href = `${homePath}Categories`;
                         }
                         setShowDelete(false);
                     }} />