Safer stripping of location names
Update address typo