diff --git a/app/controllers/public/search_controller.rb b/app/controllers/public/search_controller.rb
index 1a17c1e..67c217a 100644
--- a/app/controllers/public/search_controller.rb
+++ b/app/controllers/public/search_controller.rb
@@ -2,35 +2,10 @@ class SearchController < ApplicationController
 
   helper TagsHelper
 
-  SEARCHES = []
-
-  def self.search(&block)
-    SEARCHES << block
-  end
-
   protected
 
-  #############################################
-  # XXX add yours searches here
-  #############################################
-
-  search do |query|
-    Article.find_by_contents(query)
-  end
-
-  search do |query|
-    Profile.find_by_contents(query)
-  end
-
-  search do |query|
-    Product.find_by_contents(query)
-  end
-
-  # auxiliary method to search in all defined searches and collect the results 
-  def search(query)
-    SEARCHES.inject([]) do |acc,finder|
-      acc += finder.call(query)
-    end.sort_by do |hit|
+  def search(klass, query)
+    klass.find_by_contents(query).sort_by do |hit|
       -(relevance_for(hit))
     end
   end
@@ -42,7 +17,8 @@ class SearchController < ApplicationController
   def index
     @query = params[:query] || ''
     @filtered_query = remove_stop_words(@query)
-    @results = search(@filtered_query)
+    @articles, @people, @enterprises, @communities, @products = 
+      [Article, Person, Enterprise, Community, Product].map{ |klass| search(klass, @query) }
   end
 
   def tags
diff --git a/app/views/search/_article.rhtml b/app/views/search/_article.rhtml
index 7dac088..8006742 100644
--- a/app/views/search/_article.rhtml
+++ b/app/views/search/_article.rhtml
@@ -1,5 +1,3 @@
-<div>
-  <%= icon('cms', :style => 'float: left') %>
   <div class='search-result-text'>
     <div>
       <strong>
@@ -10,5 +8,4 @@
       <%= strip_tags(hit.abstract) %>
     </div>
   </div>
-</div>
 
diff --git a/app/views/search/_product.rhtml b/app/views/search/_product.rhtml
index 63b63bd..1dc4678 100644
--- a/app/views/search/_product.rhtml
+++ b/app/views/search/_product.rhtml
@@ -1,15 +1,15 @@
-<%# FIXME add photo if available %>
 <%# FIXME add more information %>
 
-<div>
-  <%= icon('product', :style => 'float: left') %>
   <div class='search-result-text'>
-    <%= image_tag(hit.image.public_filename(:minor), :style => 'float:right;') if hit.image %>
-      <strong>
+    <%= image_tag(hit.image.public_filename(:minor)) if hit.image %>
+    <strong>
       <%= link_to_product(hit) %>
-    </strong> <br/>
-    <%= _('Price: %d') % hit.price %> <br>
-    <%= _('Suplier: %s') % link_to_homepage(hit.enterprise.name, hit.enterprise.identifier) if  hit.enterprise  %> <br>
-    <%= _('Category: %s') % link_to_category(hit.product_category) %>
+    </strong> 
+    <ul>
+      <li> <%= _('Price: %d') % hit.price %> </li>
+      <% if hit.enterprise %>
+        <li> <%= _('Suplier: %s') % link_to_homepage(hit.enterprise.name, hit.enterprise.identifier) %> </li>
+      <% end %>
+      <li> <%= _('Category: %s') % link_to_category(hit.product_category) %> </li>
+    </ul>
   </div>
-</div>
diff --git a/app/views/search/_profile.rhtml b/app/views/search/_profile.rhtml
index 9c241b9..0d21f7f 100644
--- a/app/views/search/_profile.rhtml
+++ b/app/views/search/_profile.rhtml
@@ -1,11 +1,8 @@
-<%# FIXME add photo if available %>
 <%# FIXME add more information %>
 
-<div>
-  <%= icon('person', :style => 'float: left') %>
-  <div class='search-result-text'>
-    <strong>
-      <%= link_to_homepage(hit.name, hit.identifier) %>
-    </strong>
-  </div>
+<div class='search-result-text'>
+  <%= image_tag(hit.image.public_filename(:minor)) if hit.image %>
+  <strong>
+    <%= link_to_homepage(hit.name, hit.identifier) %>
+  </strong>
 </div>
diff --git a/app/views/search/index.rhtml b/app/views/search/index.rhtml
index 8cd8e32..de6d113 100644
--- a/app/views/search/index.rhtml
+++ b/app/views/search/index.rhtml
@@ -1,6 +1,16 @@
 <h2> <%= _('Search results for "%s"') % @query %> </h2>
 
-<% @results.each do |hit| %>
-  <%= render :partial => partial_for_class(hit.class), :locals => { :hit => hit } %>
-  <br style='clear: left'/>
+<% [ [@articles, _('Articles'), 'articles'], 
+     [@people, _('People'), 'people'], 
+     [@enterprises, _('Entreprises'), 'enterprises'], 
+     [@communities, _('Communities'), 'communities'], 
+     [@products, _('Products'), 'products'] ].each do |results, iname, name| %>
+  <% if results && !results.empty? %>
+    <div id="search-result-<%= name %>">
+      <h3> <%= iname %> </h3>
+      <% results.each do |hit| %>
+        <%= render :partial => partial_for_class(hit.class), :locals => { :hit => hit } %>
+      <% end %>
+    </div>
+  <% end %>
 <% end %>
diff --git a/test/functional/search_controller_test.rb b/test/functional/search_controller_test.rb
index cee8ef0..034dffb 100644
--- a/test/functional/search_controller_test.rb
+++ b/test/functional/search_controller_test.rb
@@ -16,9 +16,8 @@ class SearchControllerTest < Test::Unit::TestCase
     get 'index', :query => 'teste'
     assert_response :success
     assert_template 'index'
-    assert assigns('results')
-    assert assigns('results').include?(ent)
-
+    assert assigns('enterprises')
+    assert assigns('enterprises').include?(ent)
   end
 
   should 'filter stop words' do
--
libgit2 0.21.2