Fix short time-zone name parsing to match the longest name