diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js
index 8556e603..3ee7c0b6 100644
--- a/source/Ox.UI/js/Map/Ox.ListMap.js
+++ b/source/Ox.UI/js/Map/Ox.ListMap.js
@@ -431,10 +431,9 @@ Ox.ListMap = function(options, self) {
                 {id: 'region', title: 'Region'},
                 {id: 'city', title: 'City'},
                 {id: 'borough', title: 'Borough'},
-                {id: 'street', title: 'Street'},
-                {id: 'premise', title: 'Premise'},
-                {id: 'feature', title: 'Feature'},
-                {id: 'other', title: 'Other'}
+                {id: 'street', title: 'Street'}, // streets, squares, bridges, tunnels, ...
+                {id: 'building', title: 'Building'},
+                {id: 'feature', title: 'Feature'} // continents, islands, rivers, lakes, seas, oceans, ...
             ],
             label: 'Type',
             labelWidth: 64,
diff --git a/source/Ox.UI/js/Map/Ox.Map.js b/source/Ox.UI/js/Map/Ox.Map.js
index 89809aa8..c6a1e29a 100644
--- a/source/Ox.UI/js/Map/Ox.Map.js
+++ b/source/Ox.UI/js/Map/Ox.Map.js
@@ -892,20 +892,19 @@ Ox.Map = function(options, self) {
             // see http://code.google.com/apis/maps/documentation/javascript/services.html#GeocodingAddressTypes
             var strings = {
                     'country': ['country'],
-                    'region': ['administrative_area'],
+                    'region': ['administrative_area', 'colloqual_area'],
                     'city': ['locality'],
-                    'borough': ['neighborhood', 'sublocality'],
+                    'borough': ['neighborhood', 'postal_code', 'sublocality'],
                     'street': [
                         'intersection', 'route',
                         'street_address', 'street_number'
                     ],
-                    'premise': [
-                        'airport', 'establishment', 'park',
-                        'premise', 'subpremise'
-                    ],
-                    'feature': ['natural_feature']
+                    'building': [
+                        'airport', 'establishment', 'floor',
+                        'premise', 'room', 'subpremise'
+                    ]
                 },
-                type = 'other';
+                type = 'feature';
             Ox.forEach(strings, function(values, key) {
                 Ox.forEach(values, function(value) {
                     if (find(value)) {
@@ -913,7 +912,7 @@ Ox.Map = function(options, self) {
                         return false;
                     }
                 });
-                return type == 'other';
+                return type == 'feature';
             });
             return type;
             function find(type) {