whitespace in regex on streetaddress
Invoice template private/company prototype fix