From 98446222c9f35a19a848eedcdbe1a857a143e706 Mon Sep 17 00:00:00 2001
From: KZ <KZ@no.mail>
Date: Fri, 14 Aug 2015 22:20:51 +0100
Subject: [PATCH] Metasearch , fix for empty queries being converted to a
 single space, parent categories are now autoexpanded.

---
 src/Jackett/Content/custom.css               |   1 +
 src/Jackett/Content/custom.js                | 232 ++++++++++++++-----
 src/Jackett/Content/index.html               |  89 ++++++-
 src/Jackett/Controllers/AdminController.cs   |  82 ++++++-
 src/Jackett/Controllers/PotatoController.cs  |  16 +-
 src/Jackett/Controllers/TorznabController.cs |   6 +-
 src/Jackett/Indexers/AlphaRatio.cs           |   2 +-
 src/Jackett/Indexers/BB.cs                   |   2 +-
 src/Jackett/Indexers/BeyondHD.cs             |   2 +-
 src/Jackett/Indexers/BitHdtv.cs              |   3 +-
 src/Jackett/Indexers/BitMeTV.cs              |   3 +-
 src/Jackett/Indexers/Demonoid.cs             |   3 +-
 src/Jackett/Indexers/FileList.cs             |  19 +-
 src/Jackett/Indexers/FrenchTorrentDb.cs      |   6 +-
 src/Jackett/Indexers/Freshon.cs              |   5 +-
 src/Jackett/Indexers/HDSpace.cs              |   3 +-
 src/Jackett/Indexers/HDTorrents.cs           |   3 +-
 src/Jackett/Indexers/IPTorrents.cs           |   2 +-
 src/Jackett/Indexers/ImmortalSeed.cs         |   5 +-
 src/Jackett/Indexers/ManualSearchResult.cs   |  15 ++
 src/Jackett/Indexers/MoreThanTV.cs           |   3 +-
 src/Jackett/Indexers/Pretome.cs              |   4 +-
 src/Jackett/Indexers/PrivateHD.cs            |   3 +-
 src/Jackett/Indexers/RUTor.cs                |   2 +-
 src/Jackett/Indexers/SceneAccess.cs          |   3 +-
 src/Jackett/Indexers/SceneTime.cs            |   3 +-
 src/Jackett/Indexers/ShowRSS.cs              |   1 -
 src/Jackett/Indexers/Strike.cs               |   4 +-
 src/Jackett/Indexers/TVChaosUK.cs            |   2 +-
 src/Jackett/Indexers/ThePirateBay.cs         |   3 +-
 src/Jackett/Indexers/TorrentBytes.cs         |   2 +-
 src/Jackett/Indexers/TorrentDay.cs           |   2 +-
 src/Jackett/Indexers/TorrentLeech.cs         |   2 +-
 src/Jackett/Indexers/TorrentShack.cs         |   2 +-
 src/Jackett/Indexers/Torrentz.cs             |   2 +-
 src/Jackett/Indexers/nCore.cs                |   6 +-
 src/Jackett/Jackett.csproj                   |   2 +
 src/Jackett/Models/AdminSearch.cs            |  15 ++
 src/Jackett/Models/TorznabQuery.cs           |  24 ++
 39 files changed, 465 insertions(+), 119 deletions(-)
 create mode 100644 src/Jackett/Indexers/ManualSearchResult.cs
 create mode 100644 src/Jackett/Models/AdminSearch.cs

diff --git a/src/Jackett/Content/custom.css b/src/Jackett/Content/custom.css
index 2d4a2e427..e448e7719 100644
--- a/src/Jackett/Content/custom.css
+++ b/src/Jackett/Content/custom.css
@@ -214,6 +214,7 @@ hr {
 
 .modal-fillwidth {
     width: 1200px;
+    min-width:80%;
 }
 
 .indexer-caps {
diff --git a/src/Jackett/Content/custom.js b/src/Jackett/Content/custom.js
index 89e4540c3..491a9a7b5 100644
--- a/src/Jackett/Content/custom.js
+++ b/src/Jackett/Content/custom.js
@@ -50,61 +50,61 @@ $("#jackett-show-releases").click(function () {
         var item = { releases: data, Title: 'Releases' };
         var releaseDialog = $(releaseTemplate(item));
         releaseDialog.find('table').DataTable(
-            {
-                "pageLength": 20,
-                "lengthMenu": [[10, 20, 50, -1], [10, 20, 50, "All"]],
-                "order": [[0, "desc"]],
-                "columnDefs": [
-                   {
-                       "targets": 0,
-                       "visible": false,
-                       "searchable": false,
-                       "type": 'date'
-                   },
-                   {
-                       "targets": 1,
-                       "visible": false,
-                       "searchable": false,
-                       "type": 'date'
-                   },
-                   {
-                       "targets": 2,
-                       "visible": true,
-                       "searchable": false,
-                       "iDataSort": 0
-                   },
-                   {
-                       "targets": 3,
-                       "visible": true,
-                       "searchable": false,
-                       "iDataSort": 1
-                   }
-                ],
-                initComplete: function () {
-                    var count = 0;
-                    this.api().columns().every(function () {
-                        count++;
-                        if (count === 5 || count === 7) {
-                            var column = this;
-                            var select = $('<select><option value=""></option></select>')
-                                .appendTo($(column.footer()).empty())
-                                .on('change', function () {
-                                    var val = $.fn.dataTable.util.escapeRegex(
-                                        $(this).val()
-                                    );
+             {
+                 "pageLength": 20,
+                 "lengthMenu": [[10, 20, 50, -1], [10, 20, 50, "All"]],
+                 "order": [[0, "desc"]],
+                 "columnDefs": [
+                    {
+                        "targets": 0,
+                        "visible": false,
+                        "searchable": false,
+                        "type": 'date'
+                    },
+                    {
+                        "targets": 1,
+                        "visible": false,
+                        "searchable": false,
+                        "type": 'date'
+                    },
+                    {
+                        "targets": 2,
+                        "visible": true,
+                        "searchable": false,
+                        "iDataSort": 0
+                    },
+                    {
+                        "targets": 3,
+                        "visible": true,
+                        "searchable": false,
+                        "iDataSort": 1
+                    }
+                 ],
+                 initComplete: function () {
+                     var count = 0;
+                     this.api().columns().every(function () {
+                         count++;
+                         if (count === 5 || count === 7) {
+                             var column = this;
+                             var select = $('<select><option value=""></option></select>')
+                                 .appendTo($(column.footer()).empty())
+                                 .on('change', function () {
+                                     var val = $.fn.dataTable.util.escapeRegex(
+                                         $(this).val()
+                                     );
 
-                                    column
-                                        .search(val ? '^' + val + '$' : '', true, false)
-                                        .draw();
-                                });
+                                     column
+                                         .search(val ? '^' + val + '$' : '', true, false)
+                                         .draw();
+                                 });
 
-                            column.data().unique().sort().each(function (d, j) {
-                                select.append('<option value="' + d + '">' + d + '</option>')
-                            });
-                        }
-                    });
-                }
-            });
+                             column.data().unique().sort().each(function (d, j) {
+                                 select.append('<option value="' + d + '">' + d + '</option>')
+                             });
+                         }
+                     });
+                 }
+             });
         $("#modals").append(releaseDialog);
         releaseDialog.modal("show");
 
@@ -114,6 +114,132 @@ $("#jackett-show-releases").click(function () {
 });
 
 
+$("#jackett-show-search").click(function () {
+    $('#select-indexer-modal').remove();
+    var jqxhr = $.get("/admin/get_indexers", function (data) {
+        var scope = {
+            items: data.items
+        };
+    
+        var indexers = [];
+        indexers.push({ id: '', name: '-- All --' });
+        for (var i = 0; i < data.items.length; i++) {
+            if (data.items[i].configured === true) {
+                indexers.push(data.items[i]);
+            }
+        }
+
+      
+        var releaseTemplate = Handlebars.compile($("#jackett-search").html());
+        var releaseDialog = $(releaseTemplate({ indexers: indexers }));
+        $("#modals").append(releaseDialog);
+        releaseDialog.modal("show");
+
+        var setCategories = function (tracker, items) {
+            var cats = {};
+            for (var i = 0; i < items.length; i++) {
+                if (items[i].configured === true && (items[i].id === tracker || tracker ==='')) {
+                    indexers["'" + items[i].id + "'"] = items[i].name;
+                    for (var prop in items[i].caps) {
+                        cats[prop] = items[i].caps[prop];
+                    }
+                }
+            }
+            var select = $('#searchCategory');
+            select.html("<option value=''>-- All --</option>");
+            $.each(cats, function (value, key) {
+                select.append($("<option></option>")
+                   .attr("value", value).text(key + ' (' + value + ')'));
+            });
+
+
+        };
+
+        setCategories('', data.items);
+        $('#searchTracker').change(jQuery.proxy(function () {
+            var trackerId = $('#searchTracker').val();
+            setCategories(trackerId, this.items);
+        }, scope));
+
+
+        $('#jackett-search-perform').click(function () {
+            if ($('#jackett-search-perform').text().trim() !== 'Search trackers') {
+                // We are searchin already
+                return;
+            }
+
+
+            var queryObj = {
+                Query: releaseDialog.find('#searchquery').val(),
+                Category: releaseDialog.find('#searchCategory').val(),
+                Tracker: releaseDialog.find('#searchTracker').val().replace("'", "").replace("'", ""),
+            };
+            $('#searchResults').empty();
+         
+            $('#jackett-search-perform').html($('#spinner').html());
+            var jqxhr = $.post("/admin/search", queryObj, function (data) {
+                $('#jackett-search-perform').html('Search trackers');
+                var resultsTemplate = Handlebars.compile($("#jackett-search-results").html());
+                var results = $('#searchResults');
+                results.html($(resultsTemplate(data)));
+
+                results.find('table').DataTable(
+                {
+                    "pageLength": 20,
+                    "lengthMenu": [[10, 20, 50, -1], [10, 20, 50, "All"]],
+                    "order": [[0, "desc"]],
+                    "columnDefs": [
+                       {
+                           "targets": 0,
+                           "visible": false,
+                           "searchable": false,
+                           "type": 'date'
+                       },
+                       {
+                           "targets": 1,
+                           "visible": true,
+                           "searchable": false,
+                           "iDataSort": 0
+                       },
+                    ],
+                    initComplete: function () {
+                        var count = 0;
+                        this.api().columns().every(function () {
+                            count++;
+                            if (count === 3 || count === 5) {
+                                var column = this;
+                                var select = $('<select><option value=""></option></select>')
+                                    .appendTo($(column.footer()).empty())
+                                    .on('change', function () {
+                                        var val = $.fn.dataTable.util.escapeRegex(
+                                            $(this).val()
+                                        );
+
+                                        column
+                                            .search(val ? '^' + val + '$' : '', true, false)
+                                            .draw();
+                                    });
+
+                                column.data().unique().sort().each(function (d, j) {
+                                    select.append('<option value="' + d + '">' + d + '</option>')
+                                });
+                            }
+                        });
+                    }
+                });
+
+            }).fail(function () {
+                $('#jackett-search-perform').html('Search trackers');
+                doNotify("Request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
+            });
+        });
+
+    }).fail(function () {
+        doNotify("Error loading indexers, request to Jackett server failed", "danger", "glyphicon glyphicon-alert");
+    });
+});
+
+
 $("#view-jackett-logs").click(function () {
     var jqxhr = $.get("/admin/GetLogs", function (data) {
         var releaseTemplate = Handlebars.compile($("#jackett-logs").html());
diff --git a/src/Jackett/Content/index.html b/src/Jackett/Content/index.html
index e42938522..0742754ca 100644
--- a/src/Jackett/Content/index.html
+++ b/src/Jackett/Content/index.html
@@ -108,6 +108,7 @@
             </div>
         </div>
     </script>
+
     <script id="jackett-releases" type="text/x-handlebars-template">
         <div id="select-indexer-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
             <div class="modal-dialog modal-lg modal-fillwidth">
@@ -117,7 +118,7 @@
                         <h4 class="modal-title">Releases</h4>
                     </div>
                     <div class="modal-body">
-                        <p>This screen shows releases which have been recently returned from Jackett. Only the last 100 releases in the last 2 days are kept in memory for each tracker.</p>
+                        <p>This screen shows releases which have been recently returned from Jackett. Only the last 300 releases for each tracker are returned.</p>
                         <table class="dataTable compact cell-border hover stripe">
                             <thead>
                                 <tr>
@@ -178,6 +179,89 @@
         </div>
     </script>
 
+    <script id="jackett-search" type="text/x-handlebars-template">
+        <div id="select-indexer-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
+            <div class="modal-dialog modal-lg modal-fillwidth">
+                <div class="modal-content">
+                    <div class="modal-header">
+                        <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+                        <h4 class="modal-title">Metasearch</h4>
+                    </div>
+                    <div class="modal-body">
+                        <p>You can search all configured indexers from this screen.</p>
+                        <label>Query</label>
+                        <input type="text" name="query" id="searchquery" style="width:400px" />
+                        <label>Category</label>
+                        <select name="category" id="searchCategory"></select>
+                        <label>Tracker</label>
+                        <select name="tracker" id="searchTracker">
+                            {{#each indexers}}
+                            <option value="{{id}}">{{name}}</option>
+                            {{/each}}
+                        </select>
+                        <button id="jackett-search-perform" class="btn btn-success btn-sm">
+                            Search trackers<span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
+                        </button>
+                        <div id="searchResults"></div>
+                    </div>
+                    <div class="modal-footer">
+                        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </script>
+
+    <script id="jackett-search-results" type="text/x-handlebars-template">
+        <hr/>
+        <p>Your search contains results from: {{#each Indexers}}{{this}}, {{/each}}</p>
+        <table class="dataTable compact cell-border hover stripe">
+            <thead>
+                <tr>
+                    <th>Published</th>
+                    <th>Published</th>
+                    <th>Tracker</th>
+                    <th>Name</th>
+                    <th>Category</th>
+                    <th>Seeds</th>
+                    <th>Leechers</th>
+                    <th>Download</th>
+                </tr>
+            </thead>
+            <tbody>
+                {{#each Results}}
+                <tr>
+                    <td>{{PublishDate}}</td>
+                    <td>{{jacketTimespan PublishDate}}</td>
+                    <td>{{Tracker}}</td>
+                    <td><a href="{{Comments}}">{{Title}}</a></td>
+                    <td>{{CategoryDesc}}</td>
+                    <td>{{Seeders}}</td>
+                    <td>{{Peers}}</td>
+                    <td class="downloadcolumn">
+                        <a class="downloadlink" title="Download locally" href="{{Link}}"><i class="fa fa-download"></i></a>
+                        {{#if BlackholeLink}}
+                        <a class="downloadlink jacketdownloadserver" title="Save to server blackhole directory" href="{{BlackholeLink}}"><i class="fa fa-upload"></i></a>
+                        {{/if}}
+                    </td>
+                </tr>
+                {{/each}}
+            </tbody>
+            <tfoot>
+                <tr>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                    <td></td>
+                </tr>
+            </tfoot>
+        </table>
+    </script>
+
     <script id="jackett-logs" type="text/x-handlebars-template">
         <div id="select-indexer-modal" class="modal fade" tabindex="-1" role="dialog" aria-hidden="true">
             <div class="modal-dialog modal-lg modal-fillwidth">
@@ -286,6 +370,9 @@
 
         <hr />
         <div class="pull-right">
+            <button id="jackett-show-search" class="btn btn-success btn-sm">
+                Metasearch <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
+            </button>
             <button id="jackett-show-releases" class="btn btn-primary btn-sm">
                 View cached releases <span class="glyphicon glyphicon-ok-wrench" aria-hidden="true"></span>
             </button>
diff --git a/src/Jackett/Controllers/AdminController.cs b/src/Jackett/Controllers/AdminController.cs
index 174b869bf..b49fffc83 100644
--- a/src/Jackett/Controllers/AdminController.cs
+++ b/src/Jackett/Controllers/AdminController.cs
@@ -221,6 +221,11 @@ namespace Jackett.Controllers
                     item["configured"] = indexer.IsConfigured;
                     item["site_link"] = indexer.SiteLink;
                     item["potatoenabled"] = indexer.TorznabCaps.Categories.Select(c => c.ID).Any(i => PotatoController.MOVIE_CATS.Contains(i));
+
+                    var caps = new JObject();
+                    foreach (var cap in indexer.TorznabCaps.Categories)
+                        caps[cap.ID.ToString()] = cap.Name;
+                    item["caps"] = caps;
                     items.Add(item);
                 }
                 jsonReply["items"] = items;
@@ -396,9 +401,15 @@ namespace Jackett.Controllers
         [HttpGet]
         public List<TrackerCacheResult> GetCache()
         {
-            var serverUrl = string.Format("{0}://{1}:{2}/", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port);
             var results = cacheService.GetCachedResults();
+            ConfigureCacheResults(results);
+            return results;
+        }
 
+
+        private void ConfigureCacheResults(List<TrackerCacheResult> results)
+        {
+            var serverUrl = string.Format("{0}://{1}:{2}/", Request.RequestUri.Scheme, Request.RequestUri.Host, Request.RequestUri.Port);
             foreach (var result in results)
             {
                 var link = result.Link;
@@ -407,8 +418,6 @@ namespace Jackett.Controllers
                     result.BlackholeLink = serverService.ConvertToProxyLink(link, serverUrl, result.TrackerId, "bh", string.Empty);
 
             }
-
-            return results;
         }
 
         [Route("GetLogs")]
@@ -417,6 +426,73 @@ namespace Jackett.Controllers
         {
             return logCache.Logs;
         }
+
+        [Route("Search")]
+        [HttpPost]
+        public ManualSearchResult Search([FromBody]AdminSearch value)
+        {
+            var results = new List<TrackerCacheResult>();
+            var query = new TorznabQuery()
+            {
+                SearchTerm = value.Query,
+                Categories = value.Category ==0?new int[0]: new int[1] {  value.Category }
+            };
+
+            query.ExpandCatsToSubCats();
+
+            var trackers = indexerService.GetAllIndexers().Where(t=>t.IsConfigured).ToList();
+            if (!string.IsNullOrWhiteSpace(value.Tracker))
+            {
+                trackers = trackers.Where(t => t.ID == value.Tracker).ToList();
+            }
+
+            if (value.Category != 0)
+            {
+                trackers = trackers.Where(t => t.TorznabCaps.Categories.Select(c => c.ID).Contains(value.Category)).ToList();
+            }
+
+            Parallel.ForEach(trackers.ToList(), indexer =>
+            {
+                var searchResults =  indexer.PerformQuery(query).Result;
+                cacheService.CacheRssResults(indexer, searchResults);
+                searchResults = indexer.FilterResults(query, searchResults);
+
+                lock (results)
+                {
+                    if (searchResults.Count() == 0)
+                        trackers.Remove(indexer);
+
+                    foreach (var result in searchResults)
+                    {
+                        var item = Mapper.Map<TrackerCacheResult>(result);
+                        item.Tracker = indexer.DisplayName;
+                        item.TrackerId = indexer.ID;
+                        item.Peers = item.Peers - item.Seeders; // Use peers as leechers
+                        results.Add(item);
+                    }
+                }
+            });
+
+            ConfigureCacheResults(results);
+
+            if (trackers.Count > 1)
+            {
+                results = results.OrderByDescending(d => d.PublishDate).ToList();
+            }
+
+            var manualResult =  new ManualSearchResult()
+            {
+                Results = results,
+                Indexers = trackers.Select(t=>t.DisplayName).ToList()
+            };
+
+
+            if (manualResult.Indexers.Count == 0)
+                manualResult.Indexers = new List<string>() { "None" };
+
+            logger.Info(string.Format("Manual search for \"{0}\" on {1} with {2} results.", query.GetQueryString(), string.Join(", ", manualResult.Indexers), manualResult.Results.Count));
+            return manualResult;
+        }
     }
 }
 
diff --git a/src/Jackett/Controllers/PotatoController.cs b/src/Jackett/Controllers/PotatoController.cs
index d8a8a3f2b..cf5a83fc3 100644
--- a/src/Jackett/Controllers/PotatoController.cs
+++ b/src/Jackett/Controllers/PotatoController.cs
@@ -28,7 +28,19 @@ namespace Jackett.Controllers
         private ICacheService cacheService;
         private IWebClient webClient;
 
-        public static readonly int[] MOVIE_CATS = new int[] {2000, 2040, 2030, 2010};
+        public static int[] MOVIE_CATS
+        {
+            get
+            {
+                var torznabQuery = new TorznabQuery()
+                {
+                    Categories = new int[1] { TorznabCatType.Movies.ID },
+                };
+
+                torznabQuery.ExpandCatsToSubCats();
+                    return torznabQuery.Categories;
+            }
+        }
 
         public PotatoController(IIndexerManagerService i, Logger l, IServerService s, ICacheService c, IWebClient w)
         {
@@ -137,7 +149,7 @@ namespace Jackett.Controllers
             }
             else
             {
-                logger.Info(string.Format("Found {0} torrentpotato releases from {1} for: {2} {3}", releases.Count(), indexer.DisplayName, torznabQuery.SanitizedSearchTerm, torznabQuery.GetEpisodeSearchString()));
+                logger.Info(string.Format("Found {0} torrentpotato releases from {1} for: {2}", releases.Count(), indexer.DisplayName, torznabQuery.GetQueryString()));
             }
 
             // Force the return as Json
diff --git a/src/Jackett/Controllers/TorznabController.cs b/src/Jackett/Controllers/TorznabController.cs
index 0e7e0fa9c..aa5d25671 100644
--- a/src/Jackett/Controllers/TorznabController.cs
+++ b/src/Jackett/Controllers/TorznabController.cs
@@ -37,7 +37,7 @@ namespace Jackett.Controllers
         {
             var indexer = indexerService.GetIndexer(indexerID);
             var torznabQuery = TorznabQuery.FromHttpQuery(HttpUtility.ParseQueryString(Request.RequestUri.Query));
-
+           
             if (string.Equals(torznabQuery.QueryType, "caps", StringComparison.InvariantCultureIgnoreCase))
             {
                 return new HttpResponseMessage()
@@ -46,6 +46,7 @@ namespace Jackett.Controllers
                 };
             }
 
+            torznabQuery.ExpandCatsToSubCats();
             var allowBadApiDueToDebug = false;
 #if DEBUG
             allowBadApiDueToDebug = Debugger.IsAttached;
@@ -77,7 +78,6 @@ namespace Jackett.Controllers
             var filteredReleases = releases = indexer.FilterResults(torznabQuery, releases); 
             int? newItemCount = null;
 
-
             // Cache non query results
             if (string.IsNullOrEmpty(torznabQuery.SanitizedSearchTerm))
             {
@@ -95,7 +95,7 @@ namespace Jackett.Controllers
             }
 
             if (!string.IsNullOrWhiteSpace(torznabQuery.SanitizedSearchTerm)) { 
-                logBuilder.AppendFormat(" for: {0} {1}", torznabQuery.SanitizedSearchTerm, torznabQuery.GetEpisodeSearchString());
+                logBuilder.AppendFormat(" for: {0}", torznabQuery.GetQueryString());
             }
 
             logger.Info(logBuilder.ToString());
diff --git a/src/Jackett/Indexers/AlphaRatio.cs b/src/Jackett/Indexers/AlphaRatio.cs
index d498d26e5..f466a50a2 100644
--- a/src/Jackett/Indexers/AlphaRatio.cs
+++ b/src/Jackett/Indexers/AlphaRatio.cs
@@ -92,7 +92,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString = query.GetQueryString();
 
             var searchUrl = SearchUrl;
             var queryCollection = new NameValueCollection();
diff --git a/src/Jackett/Indexers/BB.cs b/src/Jackett/Indexers/BB.cs
index 6c6e673a5..8a657bfe9 100644
--- a/src/Jackett/Indexers/BB.cs
+++ b/src/Jackett/Indexers/BB.cs
@@ -88,7 +88,7 @@ namespace Jackett.Indexers
         {
             List<ReleaseInfo> releases = new List<ReleaseInfo>();
 
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString = query.GetQueryString();
             var searchUrl = SearchUrl;
             var queryCollection = new NameValueCollection();
 
diff --git a/src/Jackett/Indexers/BeyondHD.cs b/src/Jackett/Indexers/BeyondHD.cs
index 12057f136..81f472c19 100644
--- a/src/Jackett/Indexers/BeyondHD.cs
+++ b/src/Jackett/Indexers/BeyondHD.cs
@@ -83,7 +83,7 @@ namespace Jackett.Indexers
         {
             List<ReleaseInfo> releases = new List<ReleaseInfo>();
 
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString =  query.GetQueryString();
             var searchUrl = SearchUrl;
             var queryCollection = new NameValueCollection();
 
diff --git a/src/Jackett/Indexers/BitHdtv.cs b/src/Jackett/Indexers/BitHdtv.cs
index 665e12ce7..b01f3f37a 100644
--- a/src/Jackett/Indexers/BitHdtv.cs
+++ b/src/Jackett/Indexers/BitHdtv.cs
@@ -67,8 +67,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode(searchString);
+            var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode(query.GetQueryString());
             var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
             try
             {
diff --git a/src/Jackett/Indexers/BitMeTV.cs b/src/Jackett/Indexers/BitMeTV.cs
index f5764e597..8be342237 100644
--- a/src/Jackett/Indexers/BitMeTV.cs
+++ b/src/Jackett/Indexers/BitMeTV.cs
@@ -85,8 +85,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(searchString));
+            var episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
             var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
             try
             {
diff --git a/src/Jackett/Indexers/Demonoid.cs b/src/Jackett/Indexers/Demonoid.cs
index 82adb026e..c99fcbcbe 100644
--- a/src/Jackett/Indexers/Demonoid.cs
+++ b/src/Jackett/Indexers/Demonoid.cs
@@ -63,8 +63,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString));
+            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
             var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
 
             if (results.Content.Contains("No torrents found"))
diff --git a/src/Jackett/Indexers/FileList.cs b/src/Jackett/Indexers/FileList.cs
index 4ea0c6589..0b03887f5 100644
--- a/src/Jackett/Indexers/FileList.cs
+++ b/src/Jackett/Indexers/FileList.cs
@@ -86,11 +86,20 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
             var searchUrl = BrowseUrl;
+            var searchString = query.GetQueryString();
 
-            if (!string.IsNullOrWhiteSpace(searchString))
-                searchUrl += string.Format("?search={0}&cat=0&searchin=0&sort=0", HttpUtility.UrlEncode(searchString));
+            var cats = MapTorznabCapsToTrackers(query);
+            string cat = "0";
+            if (cats.Count == 1)
+            {
+                cat = cats[0];
+            }
+
+            if (!string.IsNullOrWhiteSpace(searchString) || cat != "0")
+                searchUrl += string.Format("?search={0}&cat={1}&searchin=0&sort=0", HttpUtility.UrlEncode(searchString), cat);
+
+          
 
             var response = await RequestStringWithCookiesAndRetry(searchUrl, null, BrowseUrl);
             var results = response.Content;
@@ -121,8 +130,8 @@ namespace Jackett.Indexers
                     release.Seeders = ParseUtil.CoerceInt(qRow.Find(".torrenttable:eq(8)").Text().Trim());
                     release.Peers = ParseUtil.CoerceInt(qRow.Find(".torrenttable:eq(9)").Text().Trim()) + release.Seeders;
 
-                    var cat = qRow.Find(".torrenttable:eq(0) a").First().Attr("href").Substring(15);
-                    release.Category = MapTrackerCatToNewznab(cat);
+                    var catId = qRow.Find(".torrenttable:eq(0) a").First().Attr("href").Substring(15);
+                    release.Category = MapTrackerCatToNewznab(catId);
 
                     // Skip other
                     if (release.Category != 0)
diff --git a/src/Jackett/Indexers/FrenchTorrentDb.cs b/src/Jackett/Indexers/FrenchTorrentDb.cs
index 6f1cd4cad..00d1e835a 100644
--- a/src/Jackett/Indexers/FrenchTorrentDb.cs
+++ b/src/Jackett/Indexers/FrenchTorrentDb.cs
@@ -55,10 +55,8 @@ namespace Jackett.Indexers
 
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
-
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString));
+            var releases = new List<ReleaseInfo>();
+            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
             var response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
             try
             {
diff --git a/src/Jackett/Indexers/Freshon.cs b/src/Jackett/Indexers/Freshon.cs
index b23c2107d..0b298543b 100644
--- a/src/Jackett/Indexers/Freshon.cs
+++ b/src/Jackett/Indexers/Freshon.cs
@@ -72,12 +72,11 @@ namespace Jackett.Indexers
             var releases = new List<ReleaseInfo>();
             string episodeSearchUrl;
 
-            if (string.IsNullOrEmpty(query.SanitizedSearchTerm))
+            if (string.IsNullOrEmpty(query.GetQueryString()))
                 episodeSearchUrl = SearchUrl;
             else
             {
-                var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-                episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(searchString));
+                episodeSearchUrl = string.Format("{0}?search={1}&cat=0", SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
             }
 
             var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
diff --git a/src/Jackett/Indexers/HDSpace.cs b/src/Jackett/Indexers/HDSpace.cs
index 24d2d50b1..0b455b78f 100644
--- a/src/Jackett/Indexers/HDSpace.cs
+++ b/src/Jackett/Indexers/HDSpace.cs
@@ -68,8 +68,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString));
+            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
             var response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
             var results = response.Content;
 
diff --git a/src/Jackett/Indexers/HDTorrents.cs b/src/Jackett/Indexers/HDTorrents.cs
index f56c90651..c4fa18507 100644
--- a/src/Jackett/Indexers/HDTorrents.cs
+++ b/src/Jackett/Indexers/HDTorrents.cs
@@ -66,8 +66,7 @@ namespace Jackett.Indexers
         {
             var releases = new List<ReleaseInfo>();
             var searchurls = new List<string>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var searchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString.Trim()));
+            var searchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
             var results = await RequestStringWithCookiesAndRetry(searchUrl);
             try
             {
diff --git a/src/Jackett/Indexers/IPTorrents.cs b/src/Jackett/Indexers/IPTorrents.cs
index 589461dbf..ebbef2c7d 100644
--- a/src/Jackett/Indexers/IPTorrents.cs
+++ b/src/Jackett/Indexers/IPTorrents.cs
@@ -114,7 +114,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString = query.GetQueryString();
             var searchUrl = BrowseUrl;
             var queryCollection = new NameValueCollection();
 
diff --git a/src/Jackett/Indexers/ImmortalSeed.cs b/src/Jackett/Indexers/ImmortalSeed.cs
index 66dc50412..e246b03b8 100644
--- a/src/Jackett/Indexers/ImmortalSeed.cs
+++ b/src/Jackett/Indexers/ImmortalSeed.cs
@@ -98,12 +98,11 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
             var searchUrl = BrowsePage;
 
-            if (!string.IsNullOrWhiteSpace(searchString))
+            if (!string.IsNullOrWhiteSpace(query.GetQueryString()))
             {
-                searchUrl += string.Format(QueryString, HttpUtility.UrlEncode(searchString));
+                searchUrl += string.Format(QueryString, HttpUtility.UrlEncode(query.GetQueryString()));
             }
 
             var results = await RequestStringWithCookiesAndRetry(searchUrl);
diff --git a/src/Jackett/Indexers/ManualSearchResult.cs b/src/Jackett/Indexers/ManualSearchResult.cs
new file mode 100644
index 000000000..0831640bf
--- /dev/null
+++ b/src/Jackett/Indexers/ManualSearchResult.cs
@@ -0,0 +1,15 @@
+using Jackett.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jackett.Indexers
+{
+    public class ManualSearchResult
+    {
+        public List<TrackerCacheResult> Results { get; set; }
+        public List<string> Indexers { get; set; }
+    }
+}
diff --git a/src/Jackett/Indexers/MoreThanTV.cs b/src/Jackett/Indexers/MoreThanTV.cs
index 397dea39c..8a6111516 100644
--- a/src/Jackett/Indexers/MoreThanTV.cs
+++ b/src/Jackett/Indexers/MoreThanTV.cs
@@ -89,8 +89,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode(searchString);
+            var episodeSearchUrl = SearchUrl + HttpUtility.UrlEncode(query.GetQueryString());
             WebClientStringResult response = null;
 
             response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
diff --git a/src/Jackett/Indexers/Pretome.cs b/src/Jackett/Indexers/Pretome.cs
index 496f1f02c..b24cfc60d 100644
--- a/src/Jackett/Indexers/Pretome.cs
+++ b/src/Jackett/Indexers/Pretome.cs
@@ -74,9 +74,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString));
-
+            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
             var response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
 
             try
diff --git a/src/Jackett/Indexers/PrivateHD.cs b/src/Jackett/Indexers/PrivateHD.cs
index 184dc8ca1..99009c507 100644
--- a/src/Jackett/Indexers/PrivateHD.cs
+++ b/src/Jackett/Indexers/PrivateHD.cs
@@ -73,7 +73,6 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
 
             var categoryMapping = MapTorznabCapsToTrackers(query).Distinct();
             string category = "0"; // Aka all
@@ -83,7 +82,7 @@ namespace Jackett.Indexers
             }
 
 
-            var episodeSearchUrl = string.Format(SearchUrl, category, HttpUtility.UrlEncode(searchString));
+            var episodeSearchUrl = string.Format(SearchUrl, category, HttpUtility.UrlEncode(query.GetQueryString()));
 
             var response = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
 
diff --git a/src/Jackett/Indexers/RUTor.cs b/src/Jackett/Indexers/RUTor.cs
index 296cea65f..128847a52 100644
--- a/src/Jackett/Indexers/RUTor.cs
+++ b/src/Jackett/Indexers/RUTor.cs
@@ -96,7 +96,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString = query.GetQueryString();
             var searchCategory = CAT_ANY;
 
             if (query.Categories.Contains(TorznabCatType.TV.ID) ||
diff --git a/src/Jackett/Indexers/SceneAccess.cs b/src/Jackett/Indexers/SceneAccess.cs
index 280bb212f..bdad51cf3 100644
--- a/src/Jackett/Indexers/SceneAccess.cs
+++ b/src/Jackett/Indexers/SceneAccess.cs
@@ -65,10 +65,9 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
             var searchSection = string.IsNullOrEmpty(query.Episode) ? "archive" : "browse";
             var searchCategory = string.IsNullOrEmpty(query.Episode) ? "26" : "27";
-            var searchUrl = string.Format(SearchUrl, searchSection, searchCategory, searchString);
+            var searchUrl = string.Format(SearchUrl, searchSection, searchCategory, query.GetQueryString());
             var results = await RequestStringWithCookiesAndRetry(searchUrl);
 
             try
diff --git a/src/Jackett/Indexers/SceneTime.cs b/src/Jackett/Indexers/SceneTime.cs
index f9bd74ca8..d03e186fc 100644
--- a/src/Jackett/Indexers/SceneTime.cs
+++ b/src/Jackett/Indexers/SceneTime.cs
@@ -72,8 +72,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var results = await PostDataWithCookiesAndRetry(SearchUrl, GetSearchFormData(searchString));
+            var results = await PostDataWithCookiesAndRetry(SearchUrl, GetSearchFormData(query.GetQueryString()));
 
             try
             {
diff --git a/src/Jackett/Indexers/ShowRSS.cs b/src/Jackett/Indexers/ShowRSS.cs
index bc0d6fb17..3d29157ad 100644
--- a/src/Jackett/Indexers/ShowRSS.cs
+++ b/src/Jackett/Indexers/ShowRSS.cs
@@ -82,7 +82,6 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
             var episodeSearchUrl = string.Format(SearchAllUrl);
             var result = await RequestStringWithCookiesAndRetry(episodeSearchUrl, string.Empty);
             var xmlDoc = new XmlDocument();
diff --git a/src/Jackett/Indexers/Strike.cs b/src/Jackett/Indexers/Strike.cs
index edd4060c0..ff3817351 100644
--- a/src/Jackett/Indexers/Strike.cs
+++ b/src/Jackett/Indexers/Strike.cs
@@ -80,9 +80,7 @@ namespace Jackett.Indexers
             List<ReleaseInfo> releases = new List<ReleaseInfo>();
 
             var searchTerm = string.IsNullOrEmpty(query.SanitizedSearchTerm) ? "2015" : query.SanitizedSearchTerm;
-
-            var searchString = searchTerm + " " + query.GetEpisodeSearchString();
-            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString.Trim()));
+            var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(query.GetQueryString()));
             var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl, string.Empty);
             try
             {
diff --git a/src/Jackett/Indexers/TVChaosUK.cs b/src/Jackett/Indexers/TVChaosUK.cs
index 24b01d184..b55df89a9 100644
--- a/src/Jackett/Indexers/TVChaosUK.cs
+++ b/src/Jackett/Indexers/TVChaosUK.cs
@@ -137,7 +137,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString = query.GetQueryString();
 
             // If we have no query use the RSS Page as their server is slow enough at times!
             if (string.IsNullOrWhiteSpace(searchString))
diff --git a/src/Jackett/Indexers/ThePirateBay.cs b/src/Jackett/Indexers/ThePirateBay.cs
index f628bd044..a4ad92616 100644
--- a/src/Jackett/Indexers/ThePirateBay.cs
+++ b/src/Jackett/Indexers/ThePirateBay.cs
@@ -78,8 +78,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var queryStr = HttpUtility.UrlEncode(searchString);
+            var queryStr = HttpUtility.UrlEncode(query.GetQueryString());
             var episodeSearchUrl = string.Format(SearchUrl, queryStr);
             var response = await RequestStringWithCookiesAndRetry(episodeSearchUrl, string.Empty);
 
diff --git a/src/Jackett/Indexers/TorrentBytes.cs b/src/Jackett/Indexers/TorrentBytes.cs
index 0946adbb2..4e161ac4e 100644
--- a/src/Jackett/Indexers/TorrentBytes.cs
+++ b/src/Jackett/Indexers/TorrentBytes.cs
@@ -96,7 +96,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString = query.GetQueryString();
             var searchUrl = BrowseUrl;
             var trackerCats = MapTorznabCapsToTrackers(query);
             var queryCollection = new NameValueCollection();
diff --git a/src/Jackett/Indexers/TorrentDay.cs b/src/Jackett/Indexers/TorrentDay.cs
index 5bd773647..c41511770 100644
--- a/src/Jackett/Indexers/TorrentDay.cs
+++ b/src/Jackett/Indexers/TorrentDay.cs
@@ -145,7 +145,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString = query.GetQueryString();
             var queryUrl = SearchUrl;
             var queryCollection = new NameValueCollection();
 
diff --git a/src/Jackett/Indexers/TorrentLeech.cs b/src/Jackett/Indexers/TorrentLeech.cs
index e6dedc191..b1edcd967 100644
--- a/src/Jackett/Indexers/TorrentLeech.cs
+++ b/src/Jackett/Indexers/TorrentLeech.cs
@@ -102,7 +102,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString = query.GetQueryString();
             var searchUrl = SearchUrl;
 
             if (!string.IsNullOrWhiteSpace(searchString))
diff --git a/src/Jackett/Indexers/TorrentShack.cs b/src/Jackett/Indexers/TorrentShack.cs
index d2d2ab1b4..e79b7cae6 100644
--- a/src/Jackett/Indexers/TorrentShack.cs
+++ b/src/Jackett/Indexers/TorrentShack.cs
@@ -67,7 +67,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString = query.GetQueryString();
             var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString));
             var results = await RequestStringWithCookiesAndRetry(episodeSearchUrl);
             try
diff --git a/src/Jackett/Indexers/Torrentz.cs b/src/Jackett/Indexers/Torrentz.cs
index 9d1adf6bf..e68b5efef 100644
--- a/src/Jackett/Indexers/Torrentz.cs
+++ b/src/Jackett/Indexers/Torrentz.cs
@@ -78,7 +78,7 @@ namespace Jackett.Indexers
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
             var releases = new List<ReleaseInfo>();
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
+            var searchString = query.GetQueryString();
             var episodeSearchUrl = string.Format(SearchUrl, HttpUtility.UrlEncode(searchString.Trim()));
             var xmlDoc = new XmlDocument();
             string xml = string.Empty;
diff --git a/src/Jackett/Indexers/nCore.cs b/src/Jackett/Indexers/nCore.cs
index 3e74508b3..b86176e30 100644
--- a/src/Jackett/Indexers/nCore.cs
+++ b/src/Jackett/Indexers/nCore.cs
@@ -116,10 +116,8 @@ namespace Jackett.Indexers
 
         public async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuery query)
         {
-            List<ReleaseInfo> releases = new List<ReleaseInfo>();
-
-            var searchString = query.SanitizedSearchTerm + " " + query.GetEpisodeSearchString();
-            var results = await PostDataWithCookiesAndRetry(SearchUrl, GetSearchFormData(searchString));
+            var releases = new List<ReleaseInfo>();
+            var results = await PostDataWithCookiesAndRetry(SearchUrl, GetSearchFormData(query.GetQueryString()));
 
             try
             {
diff --git a/src/Jackett/Jackett.csproj b/src/Jackett/Jackett.csproj
index 942c958c3..3bb428742 100644
--- a/src/Jackett/Jackett.csproj
+++ b/src/Jackett/Jackett.csproj
@@ -189,6 +189,7 @@
     <Compile Include="Indexers\IIndexer.cs" />
     <Compile Include="Indexers\ImmortalSeed.cs" />
     <Compile Include="Indexers\FileList.cs" />
+    <Compile Include="Indexers\ManualSearchResult.cs" />
     <Compile Include="Indexers\TVChaosUK.cs" />
     <Compile Include="Indexers\NCore.cs" />
     <Compile Include="Indexers\RuTor.cs" />
@@ -212,6 +213,7 @@
     <Compile Include="Models\CachedLog.cs" />
     <Compile Include="Models\CachedResult.cs" />
     <Compile Include="Models\CategoryMapping.cs" />
+    <Compile Include="Models\AdminSearch.cs" />
     <Compile Include="Models\IndexerConfig\ConfigurationDataFileList.cs" />
     <Compile Include="Models\IndexerConfig\ConfigurationDataBasicLoginWithRSS.cs" />
     <Compile Include="Models\IndexerConfig\ConfigurationDataRecaptchaLogin.cs" />
diff --git a/src/Jackett/Models/AdminSearch.cs b/src/Jackett/Models/AdminSearch.cs
new file mode 100644
index 000000000..dd2078b33
--- /dev/null
+++ b/src/Jackett/Models/AdminSearch.cs
@@ -0,0 +1,15 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Jackett.Models
+{
+    public class AdminSearch
+    {
+        public string Query { get; set; }
+        public string Tracker { get; set; }
+        public int Category { get; set; }
+    }
+}
diff --git a/src/Jackett/Models/TorznabQuery.cs b/src/Jackett/Models/TorznabQuery.cs
index b3bd85782..3df1a1cad 100644
--- a/src/Jackett/Models/TorznabQuery.cs
+++ b/src/Jackett/Models/TorznabQuery.cs
@@ -47,6 +47,11 @@ namespace Jackett.Models
             Categories = new int[0];
         }
 
+        public string GetQueryString()
+        {
+            return (SanitizedSearchTerm + " " + GetEpisodeSearchString()).Trim();
+        }
+
         public string GetEpisodeSearchString()
         {
             if (Season == 0)
@@ -118,5 +123,24 @@ namespace Jackett.Models
 
             return q;
         }
+
+        public void ExpandCatsToSubCats()
+        {
+            if (Categories.Count() == 0)
+                return;
+            var newCatList = new List<int>();
+            newCatList.AddRange(Categories);
+            foreach (var cat in Categories)
+            {
+                var majorCat = TorznabCatType.AllCats.Where(c => c.ID == cat).FirstOrDefault();
+                // If we search for TV we should also search for all sub cats
+                if (majorCat != null)
+                {
+                    newCatList.AddRange(majorCat.SubCategories.Select(s => s.ID));
+                }
+            }
+
+            Categories = newCatList.Distinct().ToArray();
+        }
     }
 }