diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index 6d74226..45480e5 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -209,14 +209,14 @@ class SearchController < PublicController
   attr_reader :category
 
   def tags
-    @tags = Tag.find(:all).inject({}) do |memo,tag|
+    @tags = environment.tags.inject({}) do |memo,tag|
       memo[tag.name] = tag.taggings.count
       memo
     end
   end
 
   def tag
-    @tag = Tag.find_by_name(params[:tag])
+    @tag = environment.tags.find_by_name(params[:tag])
     @tagged = @tag.taggings.map(&:taggable)
   end
 
diff --git a/app/models/environment.rb b/app/models/environment.rb
index eeec9e0..e0d5e8a 100644
--- a/app/models/environment.rb
+++ b/app/models/environment.rb
@@ -444,6 +444,8 @@ class Environment < ActiveRecord::Base
 
   has_many :events, :through => :profiles, :source => :articles, :class_name => 'Event' 
 
+  has_many :tags, :through => :articles
+
   def theme
     self[:theme] || 'default'
   end
--
libgit2 0.21.2