diff --git a/views/search/_catalog_result_list.html.erb b/views/search/_catalog_result_list.html.erb
new file mode 100644
index 0000000..6af3e1d
--- /dev/null
+++ b/views/search/_catalog_result_list.html.erb
@@ -0,0 +1,44 @@
+<div id="search-results" class="<%= !multiple_search? ? 'only-one-result-box' : 'multiple-results-boxes' %>">
+  <% @assets.each do |name| %>
+    <% search = @searches[name] %>
+
+    <input type="hidden" id="empty_result" value="<%= search[:results].blank? %>" />
+
+    <div class="search-results-<%= name %> search-results-box">
+      <% if !search[:results].blank? %>
+
+        <% if multiple_search?(@searches) %>
+          <h3><%= @names[name] %></h3>
+          <% if search[:results].total_entries > SearchController::MULTIPLE_SEARCH_LIMIT %>
+            <%= link_to(_('see all (%d)') % search[:results].total_entries, params.merge(:action => name), :class => 'see-more' ) %>
+          <% end %>
+        <% end %>
+
+        <% display = display_filter(name, params[:display]) %>
+
+        <div class="search-results-innerbox search-results-type-<%= name.to_s.singularize %> <%= 'common-profile-list-block' if SearchHelper::COMMON_PROFILE_LIST_BLOCK.include?(name) %>">
+          <ul>
+            <% search[:results].each do |hit| %>
+              <% partial = partial_for_class(hit.class, display) %>
+              <% variable_name = partial.gsub("#{display}_", '').to_sym %>
+              <%= render :partial => partial, :locals => {variable_name => hit} %>
+            <% end %>
+          </ul>
+        </div>
+      <% else %>
+        <% if multiple_search? %>
+          <h3><%= @names[name] %></h3>
+        <% end %>
+
+        <div id="search-results-empty"></div>
+
+        <input type="hidden" id="message-no-catalog-selected" value="<%= _('No software found. Try more general filters') %>" />
+        <input type="hidden" id="message-catalog-selected" value="<%= _('No software found. Try more general filters or check the software category individually') %>" />
+      <% end %>
+    </div>
+  <% end %>
+
+  <div style="clear:both"></div>
+
+  <%= add_zoom_to_images %>
+</div>
diff --git a/views/search/software_infos.html.erb b/views/search/software_infos.html.erb
index d13addf..6050d3c 100644
--- a/views/search/software_infos.html.erb
+++ b/views/search/software_infos.html.erb
@@ -3,7 +3,7 @@
 
   <%= render :partial => 'software_search_form', :locals => { :hint => _("Type words about the %s you're looking for") % @asset.to_s.singularize } %>
 
-  <%= display_results(@searches, @asset) %>
+  <%= render partial:"catalog_result_list" %>
 
   <div id="software-pagination">
     <% if params[:display] != 'map' %>
--
libgit2 0.21.2