Reduce query to Date and DateTime field on set and get