diff --git a/client/text_query.py b/client/text_query.py
index 83dd44e09..35ffd4245 100644
--- a/client/text_query.py
+++ b/client/text_query.py
@@ -810,7 +810,6 @@ def searchTaggedPackages(tags, datareturn = False, dbconn = None, EquoConnection
             results = dbconn.searchTaggedPackages(tag, atoms = True)
             for result in results:
                 foundPackages[repo][result[1]] = result[0]
-                # print info
                 if (not datareturn):
                     printPackageInfo(result[1],dbconn, EquoConnection = EquoConnection)
             if (not datareturn) and (not etpUi['quiet']):
diff --git a/server/server_query.py b/server/server_query.py
index b54b73a0c..63481ad5a 100644
--- a/server/server_query.py
+++ b/server/server_query.py
@@ -58,25 +58,25 @@ def query(myopts):
         rc = 0
 
     elif cmd == "tags":
-        rc = text_query.searchTaggedPackages(myopts[1:], dbconn = dbconn, EquoConnection = Entropy)
+        rc = text_query.searchTaggedPackages(myopts, dbconn = dbconn, EquoConnection = Entropy)
 
     elif cmd == "files":
-        rc = text_query.searchFiles(myopts[1:], dbconn = dbconn, EquoConnection = Entropy)
+        rc = text_query.searchFiles(myopts, dbconn = dbconn, EquoConnection = Entropy)
 
     elif cmd == "belongs":
-        rc = text_query.searchBelongs(myopts[1:], dbconn = dbconn, EquoConnection = Entropy)
+        rc = text_query.searchBelongs(myopts, dbconn = dbconn, EquoConnection = Entropy)
 
     elif cmd == "description":
-        rc = text_query.searchDescriptions(myopts[1:], dbconn = dbconn, EquoConnection = Entropy)
+        rc = text_query.searchDescriptions(myopts, dbconn = dbconn, EquoConnection = Entropy)
 
     elif cmd == "needed":
-        rc = text_query.searchNeeded(myopts[1:], dbconn = dbconn, EquoConnection = Entropy)
+        rc = text_query.searchNeeded(myopts, dbconn = dbconn, EquoConnection = Entropy)
 
     elif myopts[0] == "depends":
-        rc = text_query.searchDepends(myopts[1:], dbconn = dbconn, EquoConnection = Entropy)
+        rc = text_query.searchDepends(myopts, dbconn = dbconn, EquoConnection = Entropy)
 
     elif myopts[0] == "eclass":
-        rc = text_query.searchEclass(myopts[1:], dbconn = dbconn, EquoConnection = Entropy)
+        rc = text_query.searchEclass(myopts, dbconn = dbconn, EquoConnection = Entropy)
 
     del Entropy
     return rc