--- a/client/js/ldtjson-bin.js	Tue Feb 26 19:04:37 2013 +0100
+++ b/client/js/ldtjson-bin.js	Wed Feb 27 19:04:36 2013 +0100
@@ -3,12 +3,12 @@
 Rkns.Ldt.ProjectBin = Rkns.Utils.inherit(Rkns._BaseBin);
 
 Rkns.Ldt.ProjectBin.prototype.tagTemplate = Rkns._.template(
-    '<li class="Rk-Bin-Item" data-image="<%-static_url%>img/ldt-tag.png" data-uri="<%=ldt_platform%>ldtplatform/ldt/front/search/?search=<%=encodedtitle%>&field=all" data-title="<%-title%>" data-description="Tag \'<%-title%>\'">'
+    '<li class="Rk-Bin-Item" draggable="true" data-image="<%-static_url%>img/ldt-tag.png" data-uri="<%=ldt_platform%>ldtplatform/ldt/front/search/?search=<%=encodedtitle%>&field=all" data-title="<%-title%>" data-description="Tag \'<%-title%>\'">'
     + '<img class="Rk-Ldt-Tag-Icon" src="<%-static_url%>img/ldt-tag.png" /><h4><%=htitle%></h4><div class="Rk-Clear"></div></li>'
 );
 
 Rkns.Ldt.ProjectBin.prototype.annotationTemplate = Rkns._.template(
-    '<li class="Rk-Bin-Item" data-image="<%=image%>" data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/#id=<%=annotationid%>" data-title="<%-title%>" data-description="<%-description%>">'
+    '<li class="Rk-Bin-Item" draggable="true" data-image="<%=image%>" data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/#id=<%=annotationid%>" data-title="<%-title%>" data-description="<%-description%>">'
     + '<img class="Rk-Ldt-Annotation-Icon" src="<%=image%>"/><h4><%=htitle%></h4><p><%=hdescription%></p><p>Start: <%=start%>, End: <%=end%>, Duration: <%=duration%></p><div class="Rk-Clear"></div></li>'
 );
 
@@ -149,7 +149,7 @@
 Rkns.Ldt.ResultsBin = Rkns.Utils.inherit(Rkns._BaseBin);
 
 Rkns.Ldt.ResultsBin.prototype.segmentTemplate = Rkns._.template(
-    '<li class="Rk-Bin-Item" data-image="<%=image%>" data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/<%=projectid%>/<%=cuttingid%>/#id=<%=annotationid%>" data-title="<%-title%>" data-description="<%-description%>">'
+    '<li class="Rk-Bin-Item" draggable="true" data-image="<%=image%>" data-uri="<%=ldt_platform%>ldtplatform/ldt/front/player/<%=mediaid%>/#id=<%=annotationid%>" data-title="<%-title%>" data-description="<%-description%>">'
     + '<img class="Rk-Ldt-Annotation-Icon" src="<%=image%>"/><h4><%=htitle%></h4><p><%=hdescription%></p><p>Start: <%=start%>, End: <%=end%>, Duration: <%=duration%></p><div class="Rk-Clear"></div></li>'
 );
 
@@ -168,9 +168,12 @@
         var rxbase = searchstr.replace(/(\W)/g,'\\$1'),
             _rgxp = new RegExp('('+rxbase+')','gi'),
             rxtest = new RegExp(rxbase,'i')
+    } else {
+    	var rxbase = this.search.replace(/(\W)/g,'\\$1'),
+            _rgxp = new RegExp('('+rxbase+')','gi');
     }
     function highlight(_text) {
-        return searchstr ? _text.replace(_rgxp, "<span class='searchmatch'>$1</span>") : _text;
+        return _text.replace(_rgxp, "<span class='searchmatch'>$1</span>");
     }
     function convertTC(_ms) {
         function pad(_n) {
@@ -220,8 +223,8 @@
             end: convertTC(_end),
             duration: convertTC(_duration),
             mediaid: _segment.iri_id,
-            projectid: _segment.project_id,
-            cuttingid: _segment.cutting_id,
+            //projectid: _segment.project_id,
+            //cuttingid: _segment.cutting_id,
             annotationid: _segment.element_id,
             image: _img
         });