Make zones more robust by allowing types with 2 words (i.e. zip code).

Fixes #3431