Index: openacs-4/packages/xowiki/tcl/xowiki-procs.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/tcl/xowiki-procs.tcl,v
diff -u -r1.39 -r1.40
--- openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	19 Jun 2006 00:40:04 -0000	1.39
+++ openacs-4/packages/xowiki/tcl/xowiki-procs.tcl	19 Jun 2006 08:53:02 -0000	1.40
@@ -93,9 +93,9 @@
         tag     text,
         time    timestamp)"
     db_dml create-xowiki-tags-index-user \
-	"create index xowiki_tags_index_user ON xowiki_tags(user_id, page_id)"
+	"create index xowiki_tags_index_user ON xowiki_tags(user_id, item_id)"
     db_dml create-xowiki-tags-index-tag \
-	"create index xowiki_tags_index-tag ON xowiki_tags(tag, package_id)"
+	"create index xowiki_tags_index_tag ON xowiki_tags(tag, package_id)"
   }
 
 
Index: openacs-4/packages/xowiki/www/oacs-view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/oacs-view.adp,v
diff -u -r1.2 -r1.3
--- openacs-4/packages/xowiki/www/oacs-view.adp	19 Jun 2006 00:40:04 -0000	1.2
+++ openacs-4/packages/xowiki/www/oacs-view.adp	19 Jun 2006 08:53:02 -0000	1.3
@@ -155,7 +155,9 @@
 <div style="clear: both; text-align: left; font-size: 85%;">
 <p/>&nbsp;<hr>#xowiki.references_label# @references;noquote@
 @lang_links;noquote@
-<br>#xowiki.your_tags_label#: @tags_with_links;noquote@
+<br>
+<if @no_tags@ eq 0>
+#xowiki.your_tags_label#: @tags_with_links;noquote@
 (<a href='#' onclick='document.getElementById("edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>, 
 <a href='#' onclick='get_popular_tags();return false;'>#xowiki.popular_tags_link#</a>)
 <span id='edit_tags' style='display: none'><FORM action='@save_tag_link@'>
@@ -164,6 +166,7 @@
 <INPUT name='query' type='hidden' value='@return_url@'>
 </FORM>
 </span>
+</if>
 <span id='popular_tags' style='display: none'></span>
 </div><br>
 <if @gc_comments@ not nil>
Index: openacs-4/packages/xowiki/www/view.adp
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/xowiki/www/Attic/view.adp,v
diff -u -r1.20 -r1.21
--- openacs-4/packages/xowiki/www/view.adp	19 Jun 2006 00:40:04 -0000	1.20
+++ openacs-4/packages/xowiki/www/view.adp	19 Jun 2006 08:53:02 -0000	1.21
@@ -142,7 +142,9 @@
 <div style="clear: both; text-align: left; font-size: 85%;">
 <p/>&nbsp;<hr>#xowiki.references_label# @references;noquote@
 @lang_links;noquote@
-<br>#xowiki.your_tags_label#: @tags_with_links;noquote@
+<br>
+<if @no_tags@ eq 0>
+#xowiki.your_tags_label#: @tags_with_links;noquote@
 (<a href='#' onclick='document.getElementById("edit_tags").style.display="inline";return false;'>#xowiki.edit_link#</a>, 
 <a href='#' onclick='get_popular_tags();return false;'>#xowiki.popular_tags_link#</a>)
 <span id='edit_tags' style='display: none'><FORM action='@save_tag_link@'>
@@ -152,6 +154,7 @@
 </FORM>
 </span>
 <span id='popular_tags' style='display: none'></span>
+</if>
 </div><br>
 <if @gc_comments@ not nil>
    <p>#general-comments.Comments#