diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
index b9191f73c9a0627f9a10319012503a821e650221..4fcf7ea604005d95883c6571ddb2da6168e3d14a 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/util/FormUtil.js
@@ -2508,17 +2508,17 @@ var FormUtil = new function() {
                 }
             }
         }else if(_.isObject(filter)){
-            var filterFrom = filter.from ? filter.from.value : null
-            var filterTo = filter.to ? filter.to.value : null
-            if(filterFrom === null && filterTo === null){
+            var filterFrom = filter.from ? filter.from.dateObject : null
+            var filterTo = filter.to ? filter.to.dateObject : null
+            if((filterFrom === null || filterFrom === undefined) && (filterTo === null || filterTo === undefined)){
                 return true
             }else{
                 var matches = true
                 if(filterFrom){
-                    matches = matches && value >= filter.from.valueString
+                    matches = matches && value >= filter.from.dateString
                 }
                 if(filterTo){
-                    matches = matches && value <= filter.to.valueString
+                    matches = matches && value <= filter.to.dateString
                 }
                 return matches
             }
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
index 5087b278341fe69ce0a4f34fb706401e43ff2b81..bd4542174e8633a84c00a6cdfd83cfcbedd5bea6 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/AdvancedSearch/AdvancedSearchController.js
@@ -257,20 +257,20 @@ function AdvancedSearchController(mainController, forceSearch) {
                         }else if(field === "registrator"){
                             gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "REGISTRATOR", value : search, operator: "thatContainsUserId" };
                         }else if(field === "registrationDate"){
-                            if(search.from && search.from.value){
-                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "REGISTRATION_DATE", value : search.from.valueString, operator: "thatIsLaterThanOrEqualToDate" };
+                            if(search.from && search.from.dateObject){
+                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "REGISTRATION_DATE", value : search.from.dateString, operator: "thatIsLaterThanOrEqualToDate" };
                             }
-                            if(search.to && search.to.value){
-                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "REGISTRATION_DATE", value : search.to.valueString, operator: "thatIsEarlierThanOrEqualToDate" };
+                            if(search.to && search.to.dateObject){
+                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "REGISTRATION_DATE", value : search.to.dateString, operator: "thatIsEarlierThanOrEqualToDate" };
                             }
                         }else if(field === "modifier"){
                             gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "MODIFIER", value : search, operator: "thatContainsUserId" };
                         }else if(field === "modificationDate"){
-                            if(search.from && search.from.value){
-                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "MODIFICATION_DATE", value : search.from.valueString, operator: "thatIsLaterThanOrEqualToDate" };
+                            if(search.from && search.from.dateObject){
+                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "MODIFICATION_DATE", value : search.from.dateString, operator: "thatIsLaterThanOrEqualToDate" };
                             }
-                            if(search.to && search.to.value){
-                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "MODIFICATION_DATE", value : search.to.valueString, operator: "thatIsEarlierThanOrEqualToDate" };
+                            if(search.to && search.to.dateObject){
+                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "MODIFICATION_DATE", value : search.to.dateString, operator: "thatIsEarlierThanOrEqualToDate" };
                             }
                         } else if (field === "status") {
                             gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "PHYSICAL_STATUS", value : search };
@@ -287,11 +287,11 @@ function AdvancedSearchController(mainController, forceSearch) {
                             }
 
                             if(dataType === "DATE" || dataType === "TIMESTAMP"){
-                                if(search.from && search.from.value){
-                                    gridSubcriteria.rules[Util.guid()] = { type : "Property", name : "PROP." + field, value : search.from.valueString, operator: "thatIsLaterThanOrEqualToDate" };
+                                if(search.from && search.from.dateObject){
+                                    gridSubcriteria.rules[Util.guid()] = { type : "Property", name : "PROP." + field, value : search.from.dateString, operator: "thatIsLaterThanOrEqualToDate" };
                                 }
-                                if(search.to && search.to.value){
-                                    gridSubcriteria.rules[Util.guid()] = { type : "Property", name : "PROP." + field, value : search.to.valueString, operator: "thatIsEarlierThanOrEqualToDate" };
+                                if(search.to && search.to.dateObject){
+                                    gridSubcriteria.rules[Util.guid()] = { type : "Property", name : "PROP." + field, value : search.to.dateString, operator: "thatIsEarlierThanOrEqualToDate" };
                                 }
                             } else {
                                 var operator = null
diff --git a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
index 0dedfb7f91b3430a31a88cd3ace492b50c5c2d0a..007d1e1eedb9bd6f67323d60e21ebea586f999eb 100644
--- a/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
+++ b/ui-eln-lims/src/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/DataGrid/SampleDataGridUtil.js
@@ -568,20 +568,20 @@ var SampleDataGridUtil = new function() {
                         } else if (field === "registrator") {
                             gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "REGISTRATOR", value : search, operator: "thatContainsUserId" };
                         } else if (field === "registrationDate") {
-                            if (search.from && search.from.value) {
-                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "REGISTRATION_DATE", value : search.from.valueString, operator: "thatIsLaterThanOrEqualToDate" };
+                            if (search.from && search.from.dateObject) {
+                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "REGISTRATION_DATE", value : search.from.dateString, operator: "thatIsLaterThanOrEqualToDate" };
                             }
-                            if (search.to && search.to.value) {
-                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "REGISTRATION_DATE", value : search.to.valueString, operator: "thatIsEarlierThanOrEqualToDate" };
+                            if (search.to && search.to.dateObject) {
+                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "REGISTRATION_DATE", value : search.to.dateString, operator: "thatIsEarlierThanOrEqualToDate" };
                             }
                         } else if (field === "modifier") {
                             gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "MODIFIER", value : search, operator: "thatContainsUserId" };
                         } else if (field === "modificationDate") {
-                            if (search.from && search.from.value) {
-                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "MODIFICATION_DATE", value : search.from.valueString, operator: "thatIsLaterThanOrEqualToDate" };
+                            if (search.from && search.from.dateObject) {
+                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "MODIFICATION_DATE", value : search.from.dateString, operator: "thatIsLaterThanOrEqualToDate" };
                             }
-                            if (search.to && search.to.value) {
-                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "MODIFICATION_DATE", value : search.to.valueString, operator: "thatIsEarlierThanOrEqualToDate" };
+                            if (search.to && search.to.dateObject) {
+                                gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "MODIFICATION_DATE", value : search.to.dateString, operator: "thatIsEarlierThanOrEqualToDate" };
                             }
                         } else if (field === "parents") {
                             gridSubcriteria.rules[Util.guid()] = { type : "Attribute", name : "PARENTS", value : search, operator: "thatContains" };
@@ -596,11 +596,11 @@ var SampleDataGridUtil = new function() {
                             }
 
                             if (dataType === "DATE" || dataType === "TIMESTAMP") {
-                                if (search.from && search.from.value) {
-                                    gridSubcriteria.rules[Util.guid()] = { type : "Property", name : "PROP." + field, value : search.from.valueString, operator: "thatIsLaterThanOrEqualToDate" };
+                                if (search.from && search.from.dateObject) {
+                                    gridSubcriteria.rules[Util.guid()] = { type : "Property", name : "PROP." + field, value : search.from.dateString, operator: "thatIsLaterThanOrEqualToDate" };
                                 }
-                                if (search.to && search.to.value) {
-                                    gridSubcriteria.rules[Util.guid()] = { type : "Property", name : "PROP." + field, value : search.to.valueString, operator: "thatIsEarlierThanOrEqualToDate" };
+                                if (search.to && search.to.dateObject) {
+                                    gridSubcriteria.rules[Util.guid()] = { type : "Property", name : "PROP." + field, value : search.to.dateString, operator: "thatIsEarlierThanOrEqualToDate" };
                                 }
                             } else {
                                 var operator = null
@@ -928,6 +928,9 @@ var SampleDataGridUtil = new function() {
                         },
                         renderFilter : function(params) {
                             return FormUtil.renderDateRangeGridFilter(params, propertyType.dataType)
+                        },
+                        filter : function(data, filter){
+                            return FormUtil.filterDateRangeGridColumn(data[propertyType.code], filter)
                         }
                     }
                 }