further tweaking time zone normalization