diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
index f097978c05f99ed3424a1ee0181464c97578cc16..1544f03d3077e8e1f3abbb4727b5cc15f39fe548 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
@@ -1157,7 +1157,9 @@ function dateFilterFn(rows, id, filterValue) {
  function dateRangeFilterFn(rows, id, filterValue) {
   const filteredRows = _.filter(rows, function (row) {
     // If cell value is null or empty
-    if (!row.values[id]) {
+    if (filterValue.length>0 && !row.values[id]) {
+      return false;
+    } else if (!row.values[id]) {
       return true;
     }
     //Remove microsecond if value passed is UTC string in format "YYYY-MM-DDTHH:mm:ss.sssss"
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
index 6d0b5b18ec196dcbebd6ccf8cca754fd315119a8..92760509bd87567bd3e3c6894ee7bb5bc74ef898 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Scheduling/ViewSchedulingUnit.js
@@ -1446,7 +1446,6 @@ class ViewSchedulingUnit extends Component {
                         </span>
                     </div>
                 </div>
-                {console.log(this.state.schedulingUnitTasks)}
                 {this.state.isLoading ? <AppLoader /> : (this.state.schedulingUnitTasks.length > 0) ?
                     <ViewTable
                         data={this.state.schedulingUnitTasks}
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js
index bbd138a3be6d99d8cb74cbbdc0a530bda017de74..1e3ddf44003f34118847dd2ac10637c27b6b0e34 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/list.js
@@ -806,7 +806,7 @@ export class TaskList extends Component {
                 if (values[1]) {
                     this.filterQry += 'on_sky_start_time_before='+moment(new Date(values[1])).format("YYYY-MM-DDTHH:mm:ss")+".000Z&";
                 }
-            }   else if (filter.id === 'End Time') {
+            }   else if (filter.id === 'Observation End Time') {
                 const values = filter.value;
                 if (values[0]) {
                     this.filterQry += 'on_sky_stop_time_after='+ moment(new Date(values[0])).format("YYYY-MM-DDTHH:mm:ss")+".000Z&";
diff --git a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
index 9ea825cd069aacb271303823c15ee7bd37f113d5..47a04d5e6917b964d093ebda2efcfb996294f464 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/routes/Task/view.js
@@ -495,9 +495,9 @@ export class TaskView extends Component {
                                         {this.state.taskType === 'blueprint' &&
                                         <div className="p-grid">
                                             <label className="col-lg-2 col-md-2 col-sm-12">Process Start Time</label>
-                                            <span className="col-lg-4 col-md-4 col-sm-12">{this.state.task.process_start_time?moment(this.state.task.on_sky_start_time,moment.ISO_8601).format(UIConstants.CALENDAR_DATETIME_FORMAT):""}</span>
+                                            <span className="col-lg-4 col-md-4 col-sm-12">{this.state.task.process_start_time?moment(this.state.task.process_start_time,moment.ISO_8601).format(UIConstants.CALENDAR_DATETIME_FORMAT):""}</span>
                                             <label className="col-lg-2 col-md-2 col-sm-12">Process End Time</label>
-                                            <span className="col-lg-4 col-md-4 col-sm-12">{this.state.task.process_stop_time?moment(this.state.task.on_sky_stop_time,moment.ISO_8601).format(UIConstants.CALENDAR_DATETIME_FORMAT):""}</span>
+                                            <span className="col-lg-4 col-md-4 col-sm-12">{this.state.task.process_stop_time?moment(this.state.task.process_stop_time,moment.ISO_8601).format(UIConstants.CALENDAR_DATETIME_FORMAT):""}</span>
                                         </div>}
                                         <div className="p-grid">
                                             {/* <label className="col-lg-2 col-md-2 col-sm-12">Tags</label>