updated to include full world gazatteer