--- a/lib/actions/add.py	Wed Dec 31 01:22:07 2008 -0500
+++ b/lib/actions/add.py	Wed Dec 31 01:40:46 2008 -0500
@@ -2,7 +2,6 @@
 from bkmark import Bookmark
 from webutils import load_index
 from templates import Template
-from utils import unique
 import os
 
 def get_bk_from_form(form):
@@ -35,10 +34,8 @@
 
 def get_unique_keywords(form, db):
       kw = get_kw_from_form(form)
-      kw = map(db.get_keyword, kw)
-      kw = kw + get_new_kw_from_form(form)
-      kw = unique(kw) 
-      return kw
+      kw = set(map(db.get_keyword, kw))
+      return list(kw.union(get_new_kw_from_form(form))
 
 def edit(db, prefs, form, id):
     name = url = ""
@@ -86,9 +83,8 @@
 		id = db.add_bookmark(bk)
 	else:
 		db.update_bookmark(bk)
-	kw = map(db.add_keyword, get_new_kw_from_form(form))
-      	kw += map(db.get_keyword, get_kw_from_form(form))
-	db.update_keywords(id, kw)
+	kw = add_unique_keywords(db, get_unique_keywords(form, db))
+	db.update_keywords(id, kw.values())
 
 def do_it(action, db, prefs, form):
         if form.has_key('id'):