Fix issue where no seperator between street/unit/state
Fix case where no separator between street/city