Updated PO Box parsing to support unit numbers