diff --git a/wiki/extra/glitter-tips-and-tricks.html b/wiki/extra/glitter-tips-and-tricks.html
index de7ceedc..e86a5845 100644
--- a/wiki/extra/glitter-tips-and-tricks.html
+++ b/wiki/extra/glitter-tips-and-tricks.html
@@ -21,10 +21,7 @@ <h2>Edit multiple jobs</h2>
 <hr>
 <h2>Searching the Queue and History</h2>
 <p>The queue search box appears only when there are more items than the Queue item limit (set in Status and Interface settings, <span class="glyphicon glyphicon-wrench"></span>, Web Interface) or when editing multiple jobs.</p>
-<p>
-    You can also filter using keywords <code>cat</code> and <code>priority</code>. <br>
-    For example: <code>show name cat:tv</code>, <code>title cat:tv,movies</code>, <code>title priority:High,Low</code> or <code>status:Fetching</code>.
-</p>
+<p>More advanced filtering of the queue and history is possible and described in detail <a href="/wiki/extra/queue-history-searching">here</a>.</p>
 
 <hr>
 <h2>Select ranges of items (jobs, files)</h2>
@@ -73,10 +70,6 @@ <h2>Custom pause</h2>
 <h2>Quickly clear speedlimit</h2>
 <p>When you set a speedlimit, the <span class="glyphicon glyphicon-link"></span> icon will appear in the speed display. By clicking <span class="glyphicon glyphicon-link"></span>, the speedlimit will be removed.</p>
 
-<hr>
-<h2>Set action when all downloading is complete</h2>
-<p>In the menu ( <span class="glyphicon glyphicon-menu-hamburger"></span> ), set what needs to occur when all downloading (and post-processing) is complete. For example: <code>Shutdown PC</code>, <code>Standby PC</code> or run a script.</p>
-
 <script type="text/javascript">
     // Check the main language to show a message
     var isNotEnglish = false
diff --git a/wiki/extra/queue-history-searching.md b/wiki/extra/queue-history-searching.md
new file mode 100644
index 00000000..7db14292
--- /dev/null
+++ b/wiki/extra/queue-history-searching.md
@@ -0,0 +1,107 @@
+---
+title: Queue and History searching
+---
+
+# Search options
+
+The queue search box appears only when there are more items than the Queue/History item limit (set in Status and Interface settings), or when editing multiple jobs.
+
+All options accept multiple values, seperated by a comma.
+
+### Category: `cat` or `category`
+
+Examples: 
+ * `show name cat:tv`
+
+### Priority (Queue only): `priority`
+Examples:  
+* `title priority:High,Low`
+
+### Status: `status`
+
+Examples:  
+* `status:Fetching`
+* `status:Queued,Running`
+
+<table class="table table-bordered table-hover">
+  <thead>
+    <tr>
+      <th>Status</th>
+      <th>Type</th>
+      <th>Description</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <td><code>Propagating</code></td>
+      <td>Queue</td>
+      <td>Delayed download</td>
+    </tr>
+    <tr>
+      <td><code>Paused</code></td>
+      <td>Queue</td>
+      <td>Job is paused</td>
+    </tr>
+    <tr>
+      <td><code>Downloading</code></td>
+      <td>Queue</td>
+      <td>Normal downloading</td>
+    </tr>
+    <tr>
+      <td><code>Checking</code></td>
+      <td>Queue</td>
+      <td>Pre-check is running</td>
+    </tr>
+    <tr>
+      <td><code>Fetching</code></td>
+      <td>Queue</td>
+      <td>Job is downloading extra par2 files</td>
+    </tr>
+    <tr>
+      <td><code>Grabbing</code></td>
+      <td>Queue</td>
+      <td>Getting an NZB from an external site</td>
+    </tr>
+    <tr>
+      <td><code>Queued</code></td>
+      <td>Queue/History</td>
+      <td>Job is waiting for its turn to download or post-process</td>
+    </tr>
+    <tr>
+      <td><code>Moving</code></td>
+      <td>History</td>
+      <td>Files are being moved</td>
+    </tr>
+    <tr>
+      <td><code>QuickCheck</code></td>
+      <td>History</td>
+      <td>QuickCheck verification is running</td>
+    </tr>
+    <tr>
+      <td><code>Repairing</code></td>
+      <td>History</td>
+      <td>Job is being repaired (by par2)</td>
+    </tr>
+    <tr>
+      <td><code>Running</code></td>
+      <td>History</td>
+      <td>User's post-processing script is running</td>
+    </tr>
+    <tr>
+      <td><code>Verifying</code></td>
+      <td>History</td>
+      <td>Job is being verified (by par2)</td>
+    </tr>
+    <tr>
+      <td><code>Completed</code></td>
+      <td>History</td>
+      <td>Job is finished</td>
+    </tr>
+    <tr>
+      <td><code>Failed</code></td>
+      <td>History</td>
+      <td>Job has failed, now in History</td>
+    </tr>
+  </tbody>
+</table>
+