Fix zone counting, PO Box bug