diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c
index 5d873fbf4..1d1633966 100644
--- a/src/modules/everything/evry.c
+++ b/src/modules/everything/evry.c
@@ -471,7 +471,7 @@ evry_fuzzy_match(const char *str, const char *match)
 	  {
 	     if (tolower(*p) == mc)
 	       {
-		  cnt += cnt * (pos - last);
+		  cnt += cnt * (pos - last) * 10;
 		  last = pos;
 		  m++;
 		  mc = tolower(*m);
@@ -480,7 +480,7 @@ evry_fuzzy_match(const char *str, const char *match)
 
 	     if (cnt > MAX_FUZZ) return 0;
 
-	     if (isspace(mc) && strchr(p, ' '))
+	     if (isspace(mc) && !strchr(p, ' '))
 	       break;
 	  }
 
@@ -513,7 +513,8 @@ _evry_list_win_new(E_Zone *zone)
    x = (zone->w / 2) - (win->popup->w / 3);
    y = (zone->h / 2);
 
-   popup = e_popup_new(zone, x + 50, y - 4, /*XXX get from theme ?*/
+   /* TODO get offsets from theme */
+   popup = e_popup_new(zone, x + 50, y - 4,
 		       win->popup->w * 2/3 - 100,
 		       evry_conf->height);
    if (!popup) return NULL;
diff --git a/src/modules/everything/evry_plug_border.c b/src/modules/everything/evry_plug_border.c
index e2e98dc1a..d6a58480f 100644
--- a/src/modules/everything/evry_plug_border.c
+++ b/src/modules/everything/evry_plug_border.c
@@ -3,6 +3,7 @@
 
 static Evry_Plugin *p;
 
+/* TODO handle border remove events */
 
 static void
 _cleanup(Evry_Plugin *p)
@@ -16,7 +17,7 @@ _cleanup(Evry_Plugin *p)
 static void
 _item_free(Evry_Item *it)
 {
-   if (it->data[0]) e_object_unref(E_OBJECT(it->data[0]));
+   /* if (it->data[0]) e_object_unref(E_OBJECT(it->data[0])); */
 }
 
 static void
@@ -26,17 +27,16 @@ _item_add(Evry_Plugin *p, E_Border *bd, int fuzz, int *prio)
 
    it = evry_item_new(p, e_border_name_get(bd), &_item_free);
 
-   e_object_ref(E_OBJECT(bd));
+   /* e_object_ref(E_OBJECT(bd)); */
    it->data[0] = bd;
    it->fuzzy_match = fuzz;
    it->priority = *prio;
 
-   *prio = *prio - 1;
+   *prio += 1;
 
    p->items = eina_list_append(p->items, it);
 }
 
-/* TODO sort by focus history and name? */
 static int
 _cb_sort(const void *data1, const void *data2)
 {
@@ -52,20 +52,17 @@ _cb_sort(const void *data1, const void *data2)
 static int
 _fetch(Evry_Plugin *p, const char *input)
 {
-   E_Manager *man;
    E_Zone *zone;
    E_Border *bd;
-   E_Border_List *bl;
+   Eina_List *l;
    int fuzz;
    int prio = 0;
 
    _cleanup(p);
 
-   man = e_manager_current_get();
-   zone = e_util_zone_current_get(man);
+   zone = e_util_zone_current_get(e_manager_current_get());
 
-   bl = e_container_border_list_first(e_container_current_get(man));
-   while ((bd = e_container_border_list_next(bl)))
+   EINA_LIST_FOREACH(e_border_focus_stack_get(), l, bd)
      {
 	if (zone == bd->zone)
 	  {
@@ -83,7 +80,6 @@ _fetch(Evry_Plugin *p, const char *input)
 	       }
 	  }
      }
-   e_container_border_list_free(bl);
 
    if (p->items)
      {