diff --git a/scanmon.cc b/scanmon.cc
index 2309ebf..9af562d 100644
--- a/scanmon.cc
+++ b/scanmon.cc
@@ -20,7 +20,7 @@ std::vector<ScannerHit> ZoekScanner::get(SQLiteWriter& sqlw)
 {
   SearchHelper sh(sqlw);
   
-  auto matches = sh.search(d_query, {}, d_cutoff);
+  auto matches = sh.search(d_query, {}, {}, d_cutoff);
   //  std::cout<<"Got "<<matches.size()<<" matches for '"<<d_query<<"' with d_cutoff "<<d_cutoff<"\n";
   // nummer/identifier, datum, category
   std::vector<ScannerHit> ret;
diff --git a/scanmon.hh b/scanmon.hh
index 1d5e2cd..ec4d533 100644
--- a/scanmon.hh
+++ b/scanmon.hh
@@ -208,7 +208,7 @@ struct ZaakScanner : Scanner
     for(auto& h : hits)
       already.insert(eget(h,"nummer"));
     
-    auto sresults = sh.search(d_nummer, {"Document"}, d_cutoff);
+    auto sresults = sh.search(d_nummer, {"Document"}, {}, d_cutoff);
     for(const auto& sr : sresults) {
       if(already.count(sr.nummer))
 	continue;
diff --git a/search.cc b/search.cc
index d93e42c..07a81e1 100644
--- a/search.cc
+++ b/search.cc
@@ -3,7 +3,7 @@
 using namespace std;
 
 
-std::vector<SearchHelper::Result> SearchHelper::search(const std::string& query, const std::set<string>& categories, const std::string& cutoff, unsigned int mseclimit, unsigned int itemlimit)
+std::vector<SearchHelper::Result> SearchHelper::search(const std::string& query, const std::set<string>& categories, const std::set<string>& sorts, const std::string& cutoff, unsigned int mseclimit, unsigned int itemlimit)
 {
   std::vector<SearchHelper::Result> ret;
   // nummer, category, relurl, score, date, snippet, title
@@ -16,9 +16,19 @@ std::vector<SearchHelper::Result> SearchHelper::search(const std::string& query,
       continue;
     categoriesstr+= "'" + c + "'";
   }
-  auto matches = d_sqw.queryT("SELECT uuid, datum, snippet(docsearch,-1, '<b>', '</b>', '...', 20) as snip,  category, bm25(docsearch) as score FROM docsearch WHERE docsearch match ? and (datum >= ? or datum='') and (? or category in ("+categoriesstr+")) order by rowid desc"
+
+  string sortsstr;
+  for(const auto& s : sorts) {
+    if(!sortsstr.empty())
+      sortsstr += ", ";
+    if(s.find_first_of("'\"") != string::npos)
+      continue;
+    sortsstr += "'" + s + "'";
+  }
+
+  auto matches = d_sqw.queryT("SELECT uuid, datum, snippet(docsearch,-1, '<b>', '</b>', '...', 20) as snip, category, bm25(docsearch) as score FROM docsearch WHERE docsearch match ? and (datum >= ? or datum='') and (? or category in ("+categoriesstr+")) and (? or (case category when 'Document' then (select soort from meta.Document where id=uuid) when 'Activiteit' then (select soort from meta.Activiteit where id=uuid) end) in ("+sortsstr+")) order by rowid desc"
 			      + (itemlimit ? " limit "+to_string(itemlimit) : ""),
-			      {query, cutoff, categories.empty()}, mseclimit);
+			      {query, cutoff, categories.empty(), sorts.empty()}, mseclimit);
 
   for(auto& m : matches) {
     Result r;
diff --git a/search.hh b/search.hh
index 22d1250..1750fbb 100644
--- a/search.hh
+++ b/search.hh
@@ -39,6 +39,7 @@ struct SearchHelper
 
   std::vector<Result> search(const std::string& query,
 			     const std::set<std::string>& categories={},
+			     const std::set<std::string>& sorts={},
 			     const std::string& cutoff="", unsigned int mseclimit=10000,
 			     unsigned int itemlimit = 0);
   
diff --git a/sws.hh b/sws.hh
index ca22f30..1272d6c 100644
--- a/sws.hh
+++ b/sws.hh
@@ -33,12 +33,12 @@ struct LockedSqw
     return packResultsJson(result);
   }
   
-  void addValue(const std::initializer_list<std::pair<const char*, SQLiteWriter::var_t>>& values, const std::string& table="data")
+  void addValue(const std::initializer_list<std::pair<std::string, SQLiteWriter::var_t>>& values, const std::string& table="data")
   {
     std::lock_guard<std::mutex> l(sqwlock);
     sqw.addValue(values, table);
   }
-  void addValue(const std::vector<std::pair<const char*, SQLiteWriter::var_t>>& values, const std::string& table="data")
+  void addValue(const std::vector<std::pair<std::string, SQLiteWriter::var_t>>& values, const std::string& table="data")
   {
     std::lock_guard<std::mutex> l(sqwlock);
     sqw.addValue(values, table);
@@ -117,10 +117,10 @@ struct SimpleWebSystem
     {
       return sws.getIP(req);
     }
-    void log(const std::initializer_list<std::pair<const char*, SQLiteWriter::var_t>>& fields)
+    void log(const std::initializer_list<std::pair<std::string, SQLiteWriter::var_t>>& fields)
     {
       // add agent?
-      std::vector<std::pair<const char*, SQLiteWriter::var_t>> values{{"user", user}, {"ip", getIP()}, {"tstamp", time(0)}};
+      std::vector<std::pair<std::string, SQLiteWriter::var_t>> values{{"user", user}, {"ip", getIP()}, {"tstamp", time(0)}};
       for(const auto& f : fields)
         values.push_back(f);
       lsqw.addValue(values, "log");
diff --git a/testrunner.cc b/testrunner.cc
index 8368c98..407efa9 100644
--- a/testrunner.cc
+++ b/testrunner.cc
@@ -66,7 +66,7 @@ TEST_CASE("Search" * doctest::skip())
   sqw.query("ATTACH DATABASE 'tk.sqlite3' as meta");
 
   SearchHelper sh(sqw);
-  auto ret = sh.search("Werkbezoek Knooppunten internationaal", {"Activiteit", "Toezegging"}, "2024-11-01");
+  auto ret = sh.search("Werkbezoek Knooppunten internationaal", {"Activiteit", "Toezegging"}, {}, "2024-11-01");
   for(const auto& r : ret) {
     cout<<r.nummer<<" ("<<r.datum<<"): "<<r.onderwerp<<" / " << r.titel<<"\n";
   }
diff --git a/tkserv.cc b/tkserv.cc
index a9a899c..162c6f0 100644
--- a/tkserv.cc
+++ b/tkserv.cc
@@ -2253,23 +2253,25 @@ int main(int argc, char** argv)
     SearchHelper sh(idx);
 
     set<string> categories;
-    if(soorten=="activiteiten")
+    set<string> sorts;
+    if(soorten=="activiteiten") {
       categories.insert("Activiteit");
+    } else if(soorten=="moties") {
+      categories.insert("Document");
+      sorts.insert("Motie");
+    } else if(soorten=="vragenantwoorden") {
+      categories.insert("Document");
+      sorts.insert("Schriftelijke vragen");
+      sorts.insert("Antwoord schriftelijke vragen");
+      sorts.insert("Antwoord schriftelijke vragen (nader)");
+    }
 
     fmt::print("Categories: {}\n", categories);
+    fmt::print("Sorts: {}\n", sorts);
 
-    auto sres = sh.search(term, categories, limit, mseclimit, 280);
+    auto sres = sh.search(term, categories, sorts, limit, mseclimit, 280);
     nlohmann::json results = nlohmann::json::array();
     for(const auto& r : sres) {
-      
-      if(soorten=="moties" && r.soort != "Motie")
-	continue;
-      else if(soorten=="vragenantwoorden" &&
-	 (r.soort != "Schriftelijke vragen" &&
-	  r.soort != "Antwoord schriftelijke vragen" &&
-	  r.soort != "Antwoord schriftelijke vragen (nader)"))
-	continue;
-
       results.push_back(nlohmann::json({
 	    {"nummer", r.nummer},
 	    {"datum", r.datum},
@@ -2281,7 +2283,6 @@ int main(int argc, char** argv)
 	    {"bijgewerkt", r.bijgewerkt},
 	    {"persoonnummer", r.persoonnummer}
 	  }));
-				       
     }
     
     // soorten!