diff --git a/app/models/search.rb b/app/models/search.rb
index ea682b8fe..d671f4443 100644
--- a/app/models/search.rb
+++ b/app/models/search.rb
@@ -16,24 +16,24 @@ class Search
     cards = user.accessible_cards.search(query)
       .select([
         "cards.id as card_id",
+        "null as comment_id",
         "highlight(cards_search_index, 0, '<mark class=\"circled-text\"><span></span>', '</mark>') AS card_title",
         "snippet(cards_search_index, 1, '<mark class=\"circled-text\"><span></span>', '</mark>', '...', 20) AS card_description",
         "null as comment_body",
         "collections.name as collection_name",
         "cards.creator_id",
-        "'card' as source",
         "bm25(cards_search_index, 10.0, 2.0) AS score"
       ].join(","))
 
     comments = user.accessible_comments.search(query)
       .select([
         "comments.card_id as card_id",
+        "comments.id as comment_id",
         "cards.title AS card_title",
         "null AS card_description",
         "snippet(comments_search_index, 0, '<mark class=\"circled-text\"><span></span>', '</mark>', '...', 20) AS comment_body",
         "collections.name as collection_name",
         "comments.creator_id",
-        "'comment' as source",
         "bm25(comments_search_index, 1.0) AS score"
       ].join(","))
 
diff --git a/app/models/search/result.rb b/app/models/search/result.rb
index 0c443ffca..fe5132536 100644
--- a/app/models/search/result.rb
+++ b/app/models/search/result.rb
@@ -1,8 +1,10 @@
 class Search::Result < ApplicationRecord
   belongs_to :creator, class_name: "User"
+  belongs_to :card, foreign_key: :card_id, optional: true
+  belongs_to :comment, foreign_key: :comment_id, optional: true
 
   def source
-    self[:source]&.inquiry
+    comment || card
   end
 
   def readonly?
diff --git a/app/views/searches/_result.html.erb b/app/views/searches/_result.html.erb
index 1b8ab8309..810135262 100644
--- a/app/views/searches/_result.html.erb
+++ b/app/views/searches/_result.html.erb
@@ -1,5 +1,5 @@
 <li>
-  <div class="card card--search">
+  <%= link_to result.source, class: "card card--search" do %>
     <header class="card__header">
       <label class="card__collection flex align-center">
         <span class="card__id"><%= result.card_id %></span>
@@ -22,7 +22,7 @@
         <% else
              if result.comment_body.present? %>
             <div class="search__excerpt search__excerpt--comment">
-              <%= avatar_tag result.creator %>
+              <%= avatar_preview_tag result.creator %>
               <div>
                 <%= result.comment_body.html_safe %>
               </div>
@@ -31,5 +31,5 @@
         <% end %>
       </div>
     </div>
-  </div>
+  <% end %>
 </li>