Update location address munging
Update phone number formatting
Retrieve complete location info

Also fixes issue with emails.
Update search related tests