Better handling of time in filename