diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js
index dbc1287f..b9b9f2c5 100644
--- a/source/Ox.UI/js/Map/Ox.ListMap.js
+++ b/source/Ox.UI/js/Map/Ox.ListMap.js
@@ -105,7 +105,11 @@ Ox.ListMap = function(options, self) {
             id: 'geoname',
             removable: false,
             map: function(v) {
-                return v.split(', ').reverse().join(', ')
+                var names = v.split(', ');
+                if (!Ox.getCountryByGeoname(names[names.length - 1])) {
+                    names.push('~');
+                }
+                return names.reverse().join(', ')
             },
             operator: '+',
             title: 'Geoname',