diff --git a/contentScripts/search/accessSearch.js b/contentScripts/search/accessSearch.js
new file mode 100644
index 0000000..eb64e43
--- /dev/null
+++ b/contentScripts/search/accessSearch.js
@@ -0,0 +1,8 @@
+var commentaryWrongLink = $('a:contains(Comm.)')[0];
+var hrefArray = commentaryWrongLink.href.split('&');
+var searchArray = document.location.search.split('&');
+if (searchArray.includes('order=desc') && searchArray.includes('sort=comment')) {
+    hrefArray[hrefArray.length - 2] = 'order=asc';
+}
+hrefArray[hrefArray.length - 1] = 'sort=comment';
+commentaryWrongLink.href = hrefArray.join('&');
diff --git a/contentScripts/search/search.js b/contentScripts/search/search.js
index 764954a..33a7f4f 100644
--- a/contentScripts/search/search.js
+++ b/contentScripts/search/search.js
@@ -1,10 +1,5 @@
-var path = window.location.toString();
-var args = path.split('&');
-if (args[args.length -1] === 'do=search') {
-    window.location.replace(path + '&order=desc&sort=publish_date');
-}
-else {
-    var table = document.getElementsByTagName('tbody')[1];
+/* Inject scripts don't forget to add them to web_accessible_resources in manifest */
+injectScript(chrome.extension.getURL('contentScripts/search/accessSearch.js'), 'head');
 
     function addDlButton(idx, torrentId, yggToken) {
         var cell = table.rows[idx].cells[2];
diff --git a/manifest.json b/manifest.json
index 2aec8d7..6fcd963 100644
--- a/manifest.json
+++ b/manifest.json
@@ -22,6 +22,7 @@
     "web_accessible_resources" : [
       "contentScripts/addTorrent/accessAddTorrent.js",
       "contentScripts/allPages/accessAllPages.js",
+      "contentScripts/search/accessSearch.js",
       "css/style.css",
       "img/download.png"
     ],