diff --git a/indefero/src/IDF/templates/idf/issues/search.html b/indefero/src/IDF/templates/idf/issues/search.html
index 4ffce24..7a4067d 100644
--- a/indefero/src/IDF/templates/idf/issues/search.html
+++ b/indefero/src/IDF/templates/idf/issues/search.html
@@ -7,6 +7,7 @@
 <p><a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/add.png'}" alt="+" align="bottom" /></a> <a href="{$url}">{trans 'New Issue'}</a></p>{/if}
 
 {/block}
+
 {block context}
 {aurl 'open_url',   'IDF_Views_Issue::searchStatus', array($project.shortname, 'open'),   array('q' => $query)}
 {aurl 'closed_url', 'IDF_Views_Issue::searchStatus', array($project.shortname, 'closed'), array('q' => $query)}
@@ -17,7 +18,7 @@
 {blocktrans}
 <p><strong>Found open issues:</strong> <a href="{$open_url}">{$open}</a></p>
 <p><strong>Found closed issues:</strong> <a href="{$closed_url}">{$closed}</a></p>{/blocktrans}
-{if $tag !== null}
+{if $tag != null}
 {blocktrans}<p><strong>Label:</strong>
 <a href="{$open_url}" class="label"><strong>{$tag.class}:</strong>{$tag.name}</a></p>{/blocktrans}
 {else}
diff --git a/indefero/src/IDF/templates/idf/main-menu.html b/indefero/src/IDF/templates/idf/main-menu.html
index 3f6a73c..114d8bd 100644
--- a/indefero/src/IDF/templates/idf/main-menu.html
+++ b/indefero/src/IDF/templates/idf/main-menu.html
@@ -22,40 +22,6 @@
 </ul>
 
 {if $allProjects.count() != 0}
-<script type="text/javascript" charset="utf-8">
-{literal}
-$(document).ready(function() {
-
-
-    $("#prjname").keydown(function(ev) {
-        if(ev.which === 13) {
-            window.location.replace($('.projectitem :visible').first().attr("href"));
-        }
-    });
-
-    $('#prjname').keyup(function(){
-        var valThis = $(this).val().toLowerCase();
-        if(valThis == ""){
-            $('.prjlistclass > li').show();
-        } else {
-            $('.prjlistclass > li').each(function(){
-                if ($(this).attr('id') && $(this).attr('id') == "searchkeep")
-                    return true;
-                var text = $(this).text().toLowerCase();
-                (text.indexOf(valThis) >= 0) ? $(this).show() : $(this).hide();
-            });
-        };
-    });
-
-
-  $('#project-list').bind('mouseenter', function(ev) {
-    $(this).find('ul').show();
-      $("#prjname").focus();
-  }).bind('mouseleave', function(ev) {
-    $(this).find('ul').hide();
-  });
-});
-{/literal}
-</script>
+<script src="{media '/idf/js/projectsearch.js'}" type="text/javascript" charset="utf-8"></script>
 {/if}
 
diff --git a/indefero/www/media/idf/js/projectsearch.js b/indefero/www/media/idf/js/projectsearch.js
new file mode 100644
index 0000000..81387b2
--- /dev/null
+++ b/indefero/www/media/idf/js/projectsearch.js
@@ -0,0 +1,32 @@
+$(document).ready(function() {
+
+
+    $("#prjname").keydown(function(ev) {
+        if(ev.which === 13) {
+            window.location.replace($('.projectitem :visible').first().attr("href"));
+        }
+    });
+
+
+    $('#prjname').keyup(function(){
+        var valThis = $(this).val().toLowerCase();
+        if(valThis == ""){
+            $('.prjlistclass > li').show();
+        } else {
+            $('.prjlistclass > li').each(function(){
+                if ($(this).attr('id') && $(this).attr('id') == "searchkeep")
+                    return true;
+                var text = $(this).text().toLowerCase();
+                (text.indexOf(valThis) >= 0) ? $(this).show() : $(this).hide();
+            });
+        };
+    });
+
+
+    $('#project-list').bind('mouseenter', function(ev) {
+        $(this).find('ul').show();
+        $("#prjname").focus();
+    }).bind('mouseleave', function(ev) {
+        $(this).find('ul').hide();
+    });
+});
\ No newline at end of file