Another tweak to the address regex to handle building numbers and such before the actual address