Update after review

* Validate user input when mixing pre/postZone and timeZone using timeZone field instead of booleans