More accurate address, country detetction