diff --git a/webif/html/diag/queue/index.jim b/webif/html/diag/queue/index.jim
index e66e6ca..0f6f7d0 100755
--- a/webif/html/diag/queue/index.jim
+++ b/webif/html/diag/queue/index.jim
@@ -46,12 +46,16 @@ There are no tasks in the queue.
 </tbody>
 </table>
 <div class=buttonbar>
+<button id=selcomplete class=needsdata>Select Completed</button>
+<button id=selfailed class=needsdata>Select Failed</button>
+<button id=selpending class=needsdata>Select Pending</button>
+<button id=selall class=needsdata>Select All</button>
+<button id=selnone class=needsdata>Select None</button>
+</div>
+<div class=buttonbar>
 <button id=qdelete act=delete class="submit needssel">Delete</button>
 <button id=qresubmit act=resubmit class="submit needssel">Re-submit</button>
 <button id=qhold act=hold class="submit needssel">Hold</button>
-<button id=selcomplete class=needsdata>Select Completed</button>
-<button id=selall class=needsdata>Select All</button>
-<button id=selnone class=needsdata>Select None</button>
 <button class=refresh id=refresh>Refresh</button>
 <span class=isloading><img src=/img/spin.gif></span>
 </div>
diff --git a/webif/html/diag/queue/script.js b/webif/html/diag/queue/script.js
index 93c83b0..c23e165 100644
--- a/webif/html/diag/queue/script.js
+++ b/webif/html/diag/queue/script.js
@@ -163,6 +163,18 @@ $('#selall').button({icons:{primary:"ui-icon-star"}})
 	$('#queuetab input:checkbox').prop('checked', true).trigger('change');
 });
 
+$('#selpending').button({icons:{primary:"ui-icon-check"}})
+    .on('click', function() {
+        $('#queuetab input:checkbox[status="PENDING"]').prop('checked', true)
+            .trigger('change');
+});
+
+$('#selfailed').button({icons:{primary:"ui-icon-check"}})
+    .on('click', function() {
+        $('#queuetab input:checkbox[status="FAILED"]').prop('checked', true)
+            .trigger('change');
+});
+
 $('#selcomplete').button({icons:{primary:"ui-icon-check"}})
     .on('click', function() {
 	$('#queuetab input:checkbox[status="COMPLETE"]').prop('checked', true)