fix timestamp handling for new upload_timestamps