fix tz issues and make the confi preserve order