replaced long/lat with address
updating for merge