diff --git a/source/Ox.UI/js/Map/Ox.ListMap.js b/source/Ox.UI/js/Map/Ox.ListMap.js
index 046a1b22..091da69b 100644
--- a/source/Ox.UI/js/Map/Ox.ListMap.js
+++ b/source/Ox.UI/js/Map/Ox.ListMap.js
@@ -217,15 +217,16 @@ Ox.ListMap = function(options, self) {
                         items: [
                             {id: 'all', title: 'Find: All'},
                             {id: 'name', title: 'Find: Name'},
-                            {id: 'geoname', title: 'Find: Geoname'},
-                            {id: 'country', title: 'Find: Country'}
+                            {id: 'alternativeNames', title: 'Find: Alternative Names'},
+                            {id: 'geoname', title: 'Find: Geoname'}
                         ],
                         overlap: 'right',
-                        width: 128
+                        type: 'image'
                     }),
                 self.$findInput = Ox.Input({
                         clear: true,
-                        width: 192
+                        placeholder: 'Find in List',
+                        width: 234
                     })
             ]
         })
diff --git a/source/Ox.UI/js/Map/Ox.Map.js b/source/Ox.UI/js/Map/Ox.Map.js
index 90b6e4e8..e0b80b16 100644
--- a/source/Ox.UI/js/Map/Ox.Map.js
+++ b/source/Ox.UI/js/Map/Ox.Map.js
@@ -828,6 +828,7 @@ Ox.Map = function(options, self) {
         self.options.selected = place.id;
         //Ox.print('removePlace', Ox.getObjectById(self.places, place.id))
         self.places.splice(Ox.getPositionById(self.places, place.id), 1);
+        self.resultPlace && self.resultPlace.remove();
         self.resultPlace = place;
         place.marker.update();
     }