--- a/lib/folders.py	Sun Oct 26 22:26:03 2003 -0500
+++ b/lib/folders.py	Sun Oct 26 22:56:49 2003 -0500
@@ -49,14 +49,19 @@
 		map(lambda e: e[0], bookmarks),
 		selection)
     keywords = []
+    subfolders = []
     folders_keywords = selection +exclusion
     for keyword in selected_keywords:
     	if keyword['id'] not in folders_keywords:
 		keywords.append(keyword)
-    for child in children:
-    	child['count'] = len(db.select_bookmarks(selection + [child['keyword']]))
+    	for child in children:
+		if child['keyword'] == keyword['id']:
+			child['count'] = keyword['count']
+			subfolders.append(child)
+			children.remove(child)
+			break
     bookmarks = db.select_bookmarks(selection, exclusion)
     if len(bookmarks) <> 0:
    	bookmarks = db.get_bookmarks(map(lambda bk: bk[0], bookmarks))
     	bookmarks = map(lambda bk: bk.dict(), bookmarks)
-    output(prefs, folder, parents, children, bookmarks, keywords)
+    output(prefs, folder, parents, subfolders, bookmarks, keywords)

--- a/lib/my_db.py	Sun Oct 26 22:26:03 2003 -0500
+++ b/lib/my_db.py	Sun Oct 26 22:56:49 2003 -0500
@@ -341,7 +341,7 @@
 			raise "Can't erase base folder!"
 		subs = self.get_subfolders(id)
 		for sub in subs:
-			self.remove_folder(sub[0], 0)
+			self.remove_folders(sub['id'], 0)
 		self.crs.execute("""
 			DELETE FROM folders
 			WHERE id = %d AND userid = %d;