diff --git a/client/text_query.py b/client/text_query.py
index 5151b5456..0578334c1 100644
--- a/client/text_query.py
+++ b/client/text_query.py
@@ -542,21 +542,24 @@ def search_files(packages, entropy_client, entropy_repository):
         if pkg_id == -1:
             continue
 
-        files = entropy_repository.retrieveContent(pkg_id)
         atom = entropy_repository.retrieveAtom(pkg_id)
-        files = sorted(files)
+        files = entropy_repository.retrieveContentIter(
+            pkg_id, order_by="file")
+        files_len = 0
         if etpUi['quiet']:
-            for xfile in files:
+            for xfile, ftype in files:
+                files_len += 1
                 print_generic(xfile)
         else:
-            for xfile in files:
+            for xfile, ftype in files:
+                files_len += 1
                 print_info(blue(" ### ") + red(xfile))
 
         if not etpUi['quiet']:
             toc = []
             toc.append(("%s:" % (blue(_("Package")),), purple(atom)))
             toc.append(("%s:" % (blue(_("Found")),), "%s %s" % (
-                len(files), brown(_("files")),)))
+                files_len, brown(_("files")),)))
             print_table(toc)
 
     return 0
@@ -657,7 +660,7 @@ def search_orphaned_files(entropy_client):
     count = 0
 
     def gen_cont(pkg_id):
-        for path in repo.retrieveContent(pkg_id):
+        for path, ftype in repo.retrieveContentIter(pkg_id):
             # reverse sym
             for sym_dir in reverse_symlink_map:
                 if path.startswith(sym_dir):
diff --git a/client/text_rescue.py b/client/text_rescue.py
index 594e70166..233b3d757 100644
--- a/client/text_rescue.py
+++ b/client/text_rescue.py
@@ -335,8 +335,8 @@ def _database_resurrect(entropy_client):
             )
             print_info(mytxt, back = True)
             # content
-            content = dbconn.retrieveContent(idpackage)
-            for item in content:
+            content = dbconn.retrieveContentIter(idpackage)
+            for item, ftype in content:
                 if etpConst['systemroot']+item in filelist:
                     pkgsfound.add((idpackage, repo))
                     atoms[(idpackage, repo)] = idpackageatom