diff --git a/app/presenters/tag_set_presenter.rb b/app/presenters/tag_set_presenter.rb
index 5538a861a..dd8b2a4d5 100644
--- a/app/presenters/tag_set_presenter.rb
+++ b/app/presenters/tag_set_presenter.rb
@@ -34,11 +34,12 @@ private
   def build_list_item(tag, template, options)
     html = ""
     html << %{<li class="category-#{categories[tag]}">}
+    current_query = template.params[:tags] || ""
     
     if CurrentUser.user.is_privileged?
       html << %{<a href="/wiki_pages?title=#{u(tag)}">?</a> }
-      html << %{<a href="#" class="search-inc-tag">+</a> }
-      html << %{<a href="#" class="search-exl-tag">&ndash;</a> }
+      html << %{<a href="/posts?tags=#{u(current_query)}+#{u(tag)}" class="search-inc-tag">+</a> }
+      html << %{<a href="/posts?tags=#{u(current_query)}+-#{u(tag)}" class="search-exl-tag">&ndash;</a> }
     end
     
     humanized_tag = tag.tr("_", " ")
diff --git a/app/views/posts/partials/show/_options.html.erb b/app/views/posts/partials/show/_options.html.erb
index 5021b786b..e3cfebd5c 100644
--- a/app/views/posts/partials/show/_options.html.erb
+++ b/app/views/posts/partials/show/_options.html.erb
@@ -1,5 +1,7 @@
 <ul>
-  <%= resize_image_links(post, CurrentUser.user) %>
+  <% if post.is_image? %>
+    <%= resize_image_links(post, CurrentUser.user) %>
+  <% end %>
   <li><%= link_to "Edit", post_path(post), :id => "side-edit-link" %></li>
   <% if CurrentUser.is_member? %>
     <li><%= link_to "Favorite", favorites_path(:post_id => post.id), :remote => true, :method => :post, :id => "add-to-favorites" %></li>