better handing of tz selection