diff --git a/TODO.md b/TODO.md
index 3eb1e7af2b1e91ec8e6b35ff878a1bb5c8615678..9f1ef035168bdaab417a4730d36690a176471efb 100644
--- a/TODO.md
+++ b/TODO.md
@@ -2,8 +2,8 @@ Aplikace by měla obsahovat:
 * [X] Extrakce termĹŻ.
 * [X] Identifikace nevýznamových slov.
 * [X] Stemming/lematizace.
-* [ ] Výpočet vah termů.
-* [ ] Implementace indexovacĂ­ struktury.
+* [x] Výpočet vah termů.
+* [x] Implementace indexovacĂ­ struktury.
 * [ ] Vyhodnocení dotazu oproti indexovací struktuře.
 * [ ] Webový interface (zadání dotazu a vizualizace výsledku).
 
diff --git a/src/weight_calculation/main.cpp b/src/weight_calculation/main.cpp
index 055c8e301afadc8eb4d4ccb6017e2dee098d872c..7cb6673786c4a54365af1457657f3d6654c38152 100644
--- a/src/weight_calculation/main.cpp
+++ b/src/weight_calculation/main.cpp
@@ -16,7 +16,7 @@ bool calculateWeight(SQLite::Database & db, std::ofstream & ostream, const json
 
     try
     {
-        SQLite::Statement query(db, "SELECT * FROM TermDocumentOccurrence "
+        SQLite::Statement query(db, "SELECT TermDocumentOccurrence.Document_id, TermDocumentOccurrence.count FROM TermDocumentOccurrence "
                                         "JOIN Term ON TermDocumentOccurrence.Term_id = Term.id "
                                         "WHERE Term.value = :term "
                                         "ORDER BY TermDocumentOccurrence.Document_id ASC");