Updated the regex patterns (fixed the address pattern too)