--- a/lib/webutils.py	Wed Oct 08 17:51:09 2003 -0400
+++ b/lib/webutils.py	Fri Oct 10 11:38:20 2003 -0400
@@ -26,7 +26,7 @@
 		allkw = map(lambda x,y: [x, y], ids, names)
 	else:
 		allkw = db.get_all_keywords()
-	(kw, cnt) = map(list,apply(zip, db.get_keywords_count()))
+	(kw, cnt) = map(list,apply(zip, db.get_keywords_count(bk)))
 	res = []
 	for key in allkw:
 		is_selected = key[0] in sel
@@ -82,7 +82,7 @@
     tproc = get_template_processor(pref)
     bk.sort(lambda x,y: cmp(x['name'],y['name']))
     tproc.set("Bookmarks", bk)
-    kw = sort_keywords(kw[1:], pref)
+    kw = sort_keywords(kw, pref)
     tproc.set("Keywords", kw)
     tproc.set("curl", get_curl())
     tproc.set("total", len(bk))