--- a/src/ldt/ldt/ldt_utils/templates/front/front_search_results.html	Mon Jul 30 19:46:40 2012 +0200
+++ b/src/ldt/ldt/ldt_utils/templates/front/front_search_results.html	Tue Jul 31 02:27:09 2012 +0200
@@ -116,10 +116,10 @@
                             {% thumbnail res.content.image "300x200" format="PNG" crop="center" as im %}<img src="{{ im.url }}" class="img_media" width="{{ im.width }}" height="{{ im.height }}" %}">{% endthumbnail %}
                             <h4><a class="pink under b" href="{% url ldt.ldt_utils.views.front.annot_content segment.iri_id segment.project_id segment.cutting_id %}#id={{segment.element_id}}" title="{% trans 'view this annotation in the player' %}">
                             {% if segment.title %}{{ segment.title }}{% else %}{% trans "No title" %}{% endif %}</a></h4>
-                            <p class="bigmargin">{{ segment.abstract }}</p>
-                            {% if segment.tags %}
+                            <p class="bigmargin">{% if segment.context %}{{ segment.context }}{% else %}{{ segment.abstract }}{% endif %}</p>
+                            {% if segment.context_tags or segment.tags %}
                             	<h5>Tags:</h5>
-                            	<p class="result_taglist b fl">{{ segment.tags }}</p>
+                            	<p class="result_taglist b fl">{% if segment.context_tags %}{{ segment.context_tags }}{% else %}{{ segment.tags }}{% endif %}</p>
                             {% endif %}
                         </div>
                     </li>