diff --git a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
index 03d2767515d2b654bce37f88d4554d5bfb297835..bcff162b508837edcae4138665236bb0b4e2cf08 100644
--- a/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
+++ b/SAS/TMSS/frontend/tmss_webapp/src/components/ViewTable.js
@@ -365,6 +365,8 @@ function multiSelectFilterFn(rows, id, filterValue) {
  * @param {String} filterValue 
  */
 function toDatetimeFilterFn(rows, id, filterValue) {
+  let end = moment.utc(moment(filterValue, 'YYYY-MMM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
+  end =   moment(end, "DD-MM-YYYY").add(1, 'days');
   const filteredRows = _.filter(rows, function(row) {
                         // If cell value is null or empty
                         if (!row.values[id]) {
@@ -376,8 +378,6 @@ function toDatetimeFilterFn(rows, id, filterValue) {
                             // For cell data in format 'YYYY-MMM-DD'
                             rowValue = moment.utc(moment(row.values[id], 'YYYY-MMM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
                         }
-                        const end = moment.utc(moment(filterValue, 'YYYY-MMM-DDTHH:mm:SS').format("YYYY-MM-DDTHH:mm:SS"));
-                        
                         return (end.isSameOrAfter(rowValue));
                       } );
   return filteredRows;