diff --git a/rigo/rigo/models/application.py b/rigo/rigo/models/application.py
index fe467827b..71b32aa41 100644
--- a/rigo/rigo/models/application.py
+++ b/rigo/rigo/models/application.py
@@ -743,7 +743,7 @@ class ApplicationMetadata(object):
                 const_debug_write(
                     __name__,
                     "Application{%s}.download_images_async: %s" % (
-                        self._pkg_match, err,))
+                        package_key, err,))
             finally:
                 # ignore exceptions, if any, and always
                 # call callback.
diff --git a/rigo/rigo/ui/gtk3/controllers/application.py b/rigo/rigo/ui/gtk3/controllers/application.py
index 62d580050..c073a3928 100644
--- a/rigo/rigo/ui/gtk3/controllers/application.py
+++ b/rigo/rigo/ui/gtk3/controllers/application.py
@@ -35,6 +35,7 @@ from RigoDaemon.enums import AppActions as DaemonAppActions
 
 from entropy.const import etpConst, const_debug_write, \
     const_debug_enabled, const_convert_to_unicode, const_isunicode
+from entropy.services.client import WebService
 from entropy.misc import ParallelTask
 from entropy.i18n import _
 
diff --git a/rigo/rigo/ui/gtk3/widgets/apptreeview.py b/rigo/rigo/ui/gtk3/widgets/apptreeview.py
index 0396119d3..de26ccac9 100644
--- a/rigo/rigo/ui/gtk3/widgets/apptreeview.py
+++ b/rigo/rigo/ui/gtk3/widgets/apptreeview.py
@@ -635,27 +635,3 @@ class AppTreeView(Gtk.TreeView):
         if not res:
             return False
         return self.get_path_at_pos(x, y)[0] == self.get_cursor()[0]
-
-
-def on_entry_changed(widget, data):
-
-    def _work():
-        new_text = widget.get_text()
-        (view, enquirer) = data
-
-        # FIXME lxnay
-        enquirer.set_query(get_query_from_search_entry(new_text),
-                           limit=100*1000,
-                           nonapps_visible=NonAppVisibility.ALWAYS_VISIBLE)
-
-        store = view.tree_view.get_model()
-        store.clear()
-
-        store.set_from_matches(enquirer.matches)
-
-        while Gtk.events_pending():
-            Gtk.main_iteration()
-
-    if widget.stamp:
-        GObject.source_remove(widget.stamp)
-        widget.stamp = GObject.timeout_add(250, _work)
diff --git a/rigo/rigo/ui/gtk3/widgets/notifications.py b/rigo/rigo/ui/gtk3/widgets/notifications.py
index f159f7c92..1df1aaf64 100644
--- a/rigo/rigo/ui/gtk3/widgets/notifications.py
+++ b/rigo/rigo/ui/gtk3/widgets/notifications.py
@@ -30,7 +30,7 @@ from rigo.utils import build_register_url, open_url, escape_markup, \
 
 from entropy.const import etpConst, const_convert_to_unicode, \
     const_debug_write
-from entropy.i18n import _
+from entropy.i18n import _, ngettext
 from entropy.services.client import WebService
 from entropy.misc import ParallelTask