Replace current_date with current_timestamp

current_timestamp matches the now() behaviour better