Fix timezone handling with substitutions/amend dialog