Fix issues with Address#to_s breaking and city not handling seperators