fixed address regex and updated name extractor