Support for partial matching of US ZIP+4 codes

Checks for ZIP+4 like tokens and adds the short 5-digit ZIP if the ZIP+4 code cannot be found in the DB.