diff --git a/js/controllers/torrent_details.js b/js/controllers/torrent_details.js
index f36a993..bbc8109 100644
--- a/js/controllers/torrent_details.js
+++ b/js/controllers/torrent_details.js
@@ -23,8 +23,9 @@ kettu.TorrentDetails = function(transmission) {
     kettu.app.trigger('get-torrent-details', {id: id, callback: 'renderTorrentDetailsInView'});
 
     if(kettu.app.info_interval_id) { clearInterval(kettu.app.info_interval_id); }
-    kettu.app.info_interval_id = setInterval(
-      "kettu.app.trigger('get-torrent-details', {id: " + id + ", callback: 'updateTorrentDetailsInView'})",
+    kettu.app.info_interval_id = setInterval(function(){
+        kettu.app.trigger('get-torrent-details', {'id': id, 'callback': 'updateTorrentDetailsInView'});
+      },
       kettu.app.reloadInterval
     );
   });
diff --git a/js/helpers/search_helpers.js b/js/helpers/search_helpers.js
index b43f0b8..8cc3a8c 100644
--- a/js/helpers/search_helpers.js
+++ b/js/helpers/search_helpers.js
@@ -1,6 +1,6 @@
 $.expr[":"].containsIgnoreCase = function(el, i, m) {
     var search = m[3];
-    return search ? eval("/" + search + "/i").test($(el).text()) : false;
+    return search ? new RegExp(search, 'i').test($(el).text()) : false;
 };
 
 kettu.SearchHelpers = {