diff --git a/TODO b/TODO
index 7b7d70c2..e975ed79 100644
--- a/TODO
+++ b/TODO
@@ -81,16 +81,12 @@ Legend:
      [pisi mesajlarının çevrilebilir hale getirilmesi] (build.py yi örnek alın)
    - .pot stuff [build sistemine .pot oluşturma vs desteği] (pygettext)
    - translate messages mesajların çevirisinin yapılması (pisi tr.po)
- / query
-   + comar OM information (Provides)
-   + package by name, summary/description
-   + files (rpm -ql)
  / documentation
    / actionsAPI documentation, unittests (caglar - meren)
    / versioning information document
  / UI
    ? pyqt UI class to interface
-   - PISIMAT
+   / PISIMAT
    / pykde GUI (cartman)
    + improve interface
     + refactor UI, reintroduce base class
@@ -102,6 +98,10 @@ Legend:
  + configure-pending (eray)
  + ignore-deps
  + more robust upgrade
+ + query
+   + comar OM information (Provides)
+   + find package by name, display summary/description
+   + info --files option (like rpm -ql, but better of course)
  
  * medium priority
  
@@ -124,6 +124,15 @@ Legend:
  
  * low priority 
  
+ - search command: 
+    - implement an inverted index (if there's a good one, just use it)
+    - search in either summary, or description
+    - english stemming
+    - turkish stemming
+    - phonetic/syntactic fault tolerance (whichever works!)
+      - in particular evaluate soundex and metaphone
+      - research if there are language independent phonetic encodings
+      - implement as an option (or make it possible to turn it off if it works well :))
  / exception handling (baris)
    / better/more sensible exception hierarchy (eray)
    ? recovery from exceptions where necessary
@@ -162,7 +171,7 @@ Legend:
  - a database of components: faster access
  - more support for categories:
    - put categories into a database
-   - fast query for categories
+   - fast search for categories
  / make a package and sourcedb for each repo
    + packagedb
    - sourceb