diff --git a/colab/accounts/templates/search/user_search_preview.html b/colab/accounts/templates/search/user_search_preview.html
index 19e6a19..67edf11 100644
--- a/colab/accounts/templates/search/user_search_preview.html
+++ b/colab/accounts/templates/search/user_search_preview.html
@@ -7,11 +7,19 @@
     </a>
   </div>
   <div class="col-md-10">
-    <strong><a href="{% url 'user_profile' username=result.username %}"><h4>{{ result.name  }}</h4></a></strong>
+    <strong><a href="{% url 'user_profile' username=result.username %}">
+
+        {% if query %}
+            <h4>{% highlight result.name with query %}</h4></a>
+        {% else %}
+            <h4>{{ result.name }}</h4></a>
+        {% endif %}
+
+    </strong>
     <small><strong>{% trans "Since" %}: {% date_format result.date_joined %}</strong></small><br>
     <small>{% trans "Registered in" %}: <strong>{% trans "User" %}</strong></small><br>
   </div>
 </div>
 <div class="row">
   <hr>
-</div>
\ No newline at end of file
+</div>
diff --git a/colab/super_archives/templates/search/thread_search_preview.html b/colab/super_archives/templates/search/thread_search_preview.html
index 6286d61..155561d 100644
--- a/colab/super_archives/templates/search/thread_search_preview.html
+++ b/colab/super_archives/templates/search/thread_search_preview.html
@@ -2,10 +2,30 @@
 
 <div class="row">
   <div class="col-md-12">
-    <small>{% datetime_format result.modified %} - <a href="{{result.modified_by_url}}">{{ result.modified_by }}</a></small><br>
-    <h4><a href="{{result.url}}">{{ result.title }}</a></h4>
+    <small>{% datetime_format result.modified %} -
+
+        {% if query %}
+            <a href="{{result.modified_by_url}}">{% highlight result.modified_by with query max_length "1000" %}</a>
+        {% else %}
+            <a href="{{result.modified_by_url}}">{{result.modified_by }}</a>
+        {% endif %}
+
+    </small><br>
+
+    {% if query %}
+        <h4><a href="{{result.url}}">{% highlight result.title with query max_length "1000"%}</a></h4>
+    {% else %}
+        <h4><a href="{{result.url}}">{{ result.title }}</a></h4>
+    {% endif %}
+
     {% with result.latest_description|truncatewords:"85" as description %}
-        {{description | default_if_none:"a"}}<br>
+
+        {% if query %}
+            {% highlight description with query max_length "1000" %}<br>
+        {% else %}
+            {{description | default_if_none:"a"}}<br>
+        {% endif %}
+
     {% endwith %}
     <small>{% trans "Registred in" %}: <strong>{% trans "Discussion" %}</strong></small>
   </div>
--
libgit2 0.21.2