fix issues when querying to end of day + fix timestamp property