diff --git a/modules/presets/collection.js b/modules/presets/collection.js
index efc439038..08a3b65e2 100644
--- a/modules/presets/collection.js
+++ b/modules/presets/collection.js
@@ -152,8 +152,13 @@ export function presetCollection(collection) {
             ).slice(0, maxSearchResults - 1);
 
             if (geometry) {
-                var other = presets.item(geometry);
-                results = results.concat(other);
+                if (typeof geometry === 'string') {
+                    results.push(presets.item(geometry));
+                } else {
+                    geometry.forEach(function(geom) {
+                        results.push(presets.item(geom));
+                    });
+                }
             }
 
             return presetCollection(_uniq(results));
diff --git a/modules/ui/search_add.js b/modules/ui/search_add.js
index b9a307cb1..2734a0639 100644
--- a/modules/ui/search_add.js
+++ b/modules/ui/search_add.js
@@ -25,7 +25,7 @@ export function uiSearchAdd(context) {
     var presets;
     var search = d3_select(null), popover = d3_select(null), list = d3_select(null);
 
-    var shownGeometry = ['vertex', 'point', 'line', 'area'];
+    var shownGeometry = ['area', 'line', 'point', 'vertex'];
 
     function searchAdd(selection) {
 
@@ -133,7 +133,7 @@ export function uiSearchAdd(context) {
                 var value = search.property('value');
                 if (value.length) {
                     popover.selectAll('.subsection').remove();
-                    var results = presets.search(value);
+                    var results = presets.search(value, shownGeometry);
                     list.call(drawList, results);
                     popover.selectAll('.list .list-item.focused')
                         .classed('focused', false);