Datasource is timestamped
Fix date compare when null