Revert "Use location field instead of country and city"

This reverts commit 5495ee00c199c650b92e6fa336b640428c73f017.
Change location to country&city