diff --git a/app/models/category_finder.rb b/app/models/category_finder.rb
index e815068..5b76805 100644
--- a/app/models/category_finder.rb
+++ b/app/models/category_finder.rb
@@ -20,7 +20,7 @@ class CategoryFinder
       asset_class(asset).paginate(:all, options_for_find(asset_class(asset), {:order => "created_at desc, #{asset_table(asset)}.id desc"}.merge(options)))
     else
       ferret_options = {:page => options.delete(:page), :per_page => options.delete(:per_page)}
-      asset_class(asset).find_by_contents(query, ferret_options, options_for_find(asset_class(asset), options)).uniq
+      asset_class(asset).find_by_contents(query, ferret_options, options_for_find(asset_class(asset), options))
     end
   end
 
@@ -63,7 +63,7 @@ class CategoryFinder
     
     case klass.name
     when 'Comment'
-      {:select => 'distinct comments.*', :joins => 'inner join articles_categories on articles_categories.article_id = comments.article_id', :conditions => ['articles_categories.category_id = (?)', category_id]}.merge!(options)
+      {:joins => 'inner join articles_categories on articles_categories.article_id = comments.article_id', :conditions => ['articles_categories.category_id = (?)', category_id]}.merge!(options)
     when 'Product'
       if prod_cat_ids
         {:joins => 'inner join categories_profiles on products.enterprise_id = categories_profiles.profile_id', :conditions => ['categories_profiles.category_id = (?) and products.product_category_id in (?)', category_id, prod_cat_ids]}.merge!(options)
diff --git a/app/models/enterprise.rb b/app/models/enterprise.rb
index cbd3d00..c042abd 100644
--- a/app/models/enterprise.rb
+++ b/app/models/enterprise.rb
@@ -9,7 +9,7 @@ class Enterprise < Organization
   extra_data_for_index :product_categories
 
   def product_categories
-    products.map{|p| p.category_full_name}
+    products.map{|p| p.category_full_name}.compact
   end
 
   def product_updated
diff --git a/app/models/product.rb b/app/models/product.rb
index 04d0394..262c75c 100644
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -26,7 +26,7 @@ class Product < ActiveRecord::Base
   acts_as_mappable
   
   def category_full_name
-    product_category.full_name.split('/')
+    product_category ? product_category.full_name.split('/') : nil
   end
 
   acts_as_having_image
diff --git a/app/models/profile_categorization.rb b/app/models/profile_categorization.rb
index 5d3fa8f..9ba3fa1 100644
--- a/app/models/profile_categorization.rb
+++ b/app/models/profile_categorization.rb
@@ -4,7 +4,7 @@ class ProfileCategorization < ActiveRecord::Base
   belongs_to :category
 
   def self.add_category_to_profile(category, profile)
-
+    return if self.find_by_category_id_and_profile_id(category.id, profile.id)
     connection.execute("insert into categories_profiles (category_id, profile_id) values(#{category.id}, #{profile.id})")
 
     c = category.parent
diff --git a/app/views/search/_product_categories_menu.rhtml b/app/views/search/_product_categories_menu.rhtml
index 8cba0d8..491018e 100644
--- a/app/views/search/_product_categories_menu.rhtml
+++ b/app/views/search/_product_categories_menu.rhtml
@@ -3,7 +3,11 @@
 <div id="product-categories-menu">
   <ul>
     <% if product_categories_menu.empty? %>
-      <li class="cat-empty"> <%= _('There is no sub-categories for %s.') % @product_category.name %> </li>
+      <% if @product_category %>
+        <li class="cat-empty"> <%= _('There is no sub-categories for %s.') % @product_category.name %> </li>
+      <% else %>
+        <li class="cat-empty"> <%= _('There is no categories.') %> </li>
+      <% end %>
     <% end %>
     <% product_categories_menu.each do |cat, hits, childs| %>
       <li class="cat-parent" onmouseover="prodCatMenuOver(this)" onmouseout="prodCatMenuOut(this)">
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index 9512f07..9b3a184 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -244,11 +244,11 @@ class SearchControllerTest < Test::Unit::TestCase
   end
 
   should 'find products in a specific category' do
-    ent1 = Enterprise.create!(:name => 'teste1', :identifier => 'teste1'); ent1.add_category @category
+    ent1 = Enterprise.create!(:name => 'teste1', :identifier => 'teste1', :category_ids => [@category.id])
     ent2 = Enterprise.create!(:name => 'teste2', :identifier => 'teste2')
     prod1 = ent1.products.create!(:name => 'a beautiful product')
     prod2 = ent2.products.create!(:name => 'another beautiful product')
-    get :index, :category_path => ['my-category'], :query => 'beautiful', :find_in => ['products']
+    get :index, :category_path => @category.path.split('/'), :query => 'beautiful', :find_in => ['products']
     assert_includes assigns(:results)[:products], prod1
     assert_not_includes assigns(:results)[:products], prod2
   end
diff --git a/test/unit/category_finder_test.rb b/test/unit/category_finder_test.rb
index bb089d4..f568ff3 100644
--- a/test/unit/category_finder_test.rb
+++ b/test/unit/category_finder_test.rb
@@ -167,6 +167,8 @@ class CategoryFinderTest < ActiveSupport::TestCase
     p1 = @finder.find('enterprises', 'teste', :per_page => 1, :page => 1)
     p2 = @finder.find('enterprises', 'teste', :per_page => 1, :page => 2)
 
+    assert_respond_to p1, :total_entries
+    assert_respond_to p2, :total_entries
     assert (p1 == [ent1] && p2 == [ent2]) || (p1 == [ent2] && p2 == [ent1]) # consistent paging
   end
 
@@ -209,25 +211,23 @@ class CategoryFinderTest < ActiveSupport::TestCase
   end
 
   should 'count enterprises with query and options' do
-    options = mock
     results = mock
 
-    @finder.expects(:find).with('people', 'my query', options).returns(results)
+    @finder.expects(:find).with('people', 'my query', kind_of(Hash)).returns(results)
 
     results.expects(:total_hits).returns(99)
 
-    assert_equal 99, @finder.count('people', 'my query', options)
+    assert_equal 99, @finder.count('people', 'my query', {})
   end
   
   should 'count enterprises without query but with options' do
-    options = mock
     results = mock
 
-    @finder.expects(:find).with('people', nil, options).returns(results)
+    @finder.expects(:find).with('people', nil, kind_of(Hash)).returns(results)
 
-    results.expects(:size).returns(99)
+    results.expects(:total_entries).returns(99)
 
-    assert_equal 99, @finder.count('people', nil, options)
+    assert_equal 99, @finder.count('people', nil, {})
   end
   
   should 'not list more people than limit' do
@@ -252,13 +252,14 @@ class CategoryFinderTest < ActiveSupport::TestCase
   should 'not return the same result twice' do
     parent = Category.create!(:name => 'parent category', :environment => Environment.default)
     child  = Category.create!(:name => 'child category', :environment => Environment.default, :parent => parent)
-    p1 = create_user('people_1').person; p1.name = 'a beautiful person'; p1.add_category(child); p1.save!
-    p1.add_category(parent); p1.save!
+    p1 = create_user('people_1').person
+    p1.name = 'a beautiful person'
+    p1.category_ids = [child.id, parent.id]; p1.save!
 
     f = CategoryFinder.new(parent)
     result = f.find(:people, 'beautiful')
 
-    assert_equivalent [p1], result
+    assert_equal [p1], result
     assert_equal 1, result.size
   end
 
diff --git a/test/unit/enterprise_test.rb b/test/unit/enterprise_test.rb
index 4ff88c1..976b7da 100644
--- a/test/unit/enterprise_test.rb
+++ b/test/unit/enterprise_test.rb
@@ -173,4 +173,22 @@ class EnterpriseTest < Test::Unit::TestCase
     end
   end
 
+  should 'list product categories full name' do
+    full_name = mock
+    ent = Enterprise.create!(:name => 'test ent', :identifier => 'test_ent')
+    p = ent.products.create!(:name => 'test prod')
+    p.expects(:category_full_name).returns(full_name)
+
+    assert_equal [full_name], ent.product_categories
+  end
+
+  should 'not return nil values when have uncategorized products' do
+    full_name = mock
+    ent = Enterprise.create!(:name => 'test ent', :identifier => 'test_ent')
+    p1 = ent.products.create!(:name => 'test prod 1')
+    p1.expects(:category_full_name).returns(full_name)
+    p2 = ent.products.create!(:name => 'test prod 2')
+
+    assert_equal [full_name], ent.product_categories
+  end
 end
diff --git a/test/unit/environment_finder_test.rb b/test/unit/environment_finder_test.rb
index f359ad3..7cc47ab 100644
--- a/test/unit/environment_finder_test.rb
+++ b/test/unit/environment_finder_test.rb
@@ -116,14 +116,13 @@ class EnvironmentFinderTest < ActiveSupport::TestCase
   should 'count enterprises with query and options' do
     env = Environment.default
     finder = EnvironmentFinder.new(env)
-    options = mock
     results = mock
 
-    finder.expects(:find).with('people', 'my query', options).returns(results)
+    finder.expects(:find).with('people', 'my query', kind_of(Hash)).returns(results)
 
     results.expects(:total_hits).returns(99)
 
-    assert_equal 99, finder.count('people', 'my query', options)
+    assert_equal 99, finder.count('people', 'my query', {})
   end
 
   should 'find articles by initial' do
diff --git a/test/unit/product_test.rb b/test/unit/product_test.rb
index c762ae9..b6f7588 100644
--- a/test/unit/product_test.rb
+++ b/test/unit/product_test.rb
@@ -72,10 +72,16 @@ class ProductTest < Test::Unit::TestCase
     cat.expects(:full_name).returns('A/B/C')
 
     p = Product.new
-    p.expects(:product_category).returns(cat)
+    p.stubs(:product_category).returns(cat)
     assert_equal ['A','B','C'], p.category_full_name
   end
 
+  should 'return a nil cateory full name when not categorized' do
+    p = Product.new
+    p.stubs(:product_category).returns(nil)
+    assert_equal nil, p.category_full_name
+  end
+
   should 'be indexed by category full name' do
     p = Product.new(:name => 'a test product')
     p.expects(:category_full_name).returns('interesting category')
--
libgit2 0.21.2