QueryBuilder also needs access to the tz. Is it too hard to ask that this is the last of the Tz issues?