diff --git a/plugins/search2/LuceneStatisticsDashlet.php b/plugins/search2/LuceneStatisticsDashlet.php
index 3cc6544..33b9dce 100644
--- a/plugins/search2/LuceneStatisticsDashlet.php
+++ b/plugins/search2/LuceneStatisticsDashlet.php
@@ -101,8 +101,11 @@ class LuceneStatisticsDashlet extends KTBaseDashlet
 			$docsInIndex = $index->getDocumentsInIndex();
 
 			// we are only interested in documents that are active
-			$sql = "SELECT count(*) as docsInQueue FROM index_files q INNER JOIN documents d on q.document_id=d.id WHERE d.status_id=1";
-			$docsInQueue  = DBUtil::getOneResultKey($sql, 'docsInQueue');
+			$docsInQueue = $index->getIndexingQueue();
+			$docsInQueue = count($docsInQueue);
+
+			$errorsInQueue = $index->getIndexingQueue(true);
+			$errorsInQueue = count($errorsInQueue);
 
 			$sql = "SELECT count(*) as docsInRepository FROM documents";
 			$docsInRepository = DBUtil::getOneResultKey($sql, 'docsInRepository');
@@ -138,6 +141,7 @@ class LuceneStatisticsDashlet extends KTBaseDashlet
 	    		'indexingPeriod'=>$indexingPeriod,
 	    		'docsInIndex'=>$docsInIndex,
 	    		'docsInQueue'=>$docsInQueue,
+	    		'errorsInQueue'=>$errorsInQueue,
 	    		'docsInRepository'=>$docsInRepository,
 	    		'indexingCoverage'=>$indexingCoverage,
 	    		'queueCoverage'=>$queueCoverage,
diff --git a/plugins/search2/reporting/IndexErrors.php b/plugins/search2/reporting/IndexErrors.php
index 0f25265..b13a043 100644
--- a/plugins/search2/reporting/IndexErrors.php
+++ b/plugins/search2/reporting/IndexErrors.php
@@ -1,98 +1,106 @@
-<?php
-/**
- * $Id:$
- *
- * KnowledgeTree Open Source Edition
- * Document Management Made Simple
- * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
- * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
- * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
- * copyright notice. 
- * Contributor( s): ______________________________________
- *
- */
- 
-require_once(KT_LIB_DIR . '/dispatcher.inc.php');
-require_once(KT_LIB_DIR . '/templating/templating.inc.php');
-require_once(KT_LIB_DIR . '/mime.inc.php');
-
-class IndexErrorsDispatcher extends KTAdminDispatcher { 
-    
-    function check() {
-        $this->aBreadcrumbs[] = array(
-            'url' => $_SERVER['PHP_SELF'],
-            'name' => _kt('Document Indexing Diagnostics'),
-        );
-        return parent::check();
-    }
-
-    function do_main() {
-        
-        //registerTypes registers the mime types and populates the needed tables. 
-        $indexer = Indexer::get();
-        $indexer->registerTypes();
-        
-        if($_REQUEST['rescheduleValue'] == 'reschedule')
-        {
-				
-			foreach(KTUtil::arrayGet($_REQUEST, 'index_error', array()) as $sDocId => $v)
-			{
-				Indexer::reindexDocument($sDocId);
-				
-			}
-			
-        }
-        else if($_REQUEST['rescheduleValue'] == 'rescheduleall')
-        {
-        	$aIndexerValues = Indexer::getIndexingQueue();
-        	foreach ($aIndexerValues as $sDocValues)
-			{
-				Indexer::reindexDocument($sDocValues['document_id']);
-			}
-			
-        }
- 		require_once(KT_LIB_DIR . "/templating/templating.inc.php");
-        $oTemplating =& KTTemplating::getSingleton();
-        $oTemplating->addLocation('Index Errors', '/plugins/search2/reporting/templates');
-        
-        $oTemplate =& $oTemplating->loadTemplate('indexerrors');
-        
-        $aIndexerValues = Indexer::getIndexingQueue();
-        
-        $oTemplate->setData(array(
-            'context' => $this,
-            'index_errors' => $aIndexerValues
-            
-        ));
-        return $oTemplate;
-    }
-    
-    
-
-}
-
-
-?>
+<?php
+/**
+ * $Id:$
+ *
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s): ______________________________________
+ *
+ */
+
+require_once(KT_LIB_DIR . '/dispatcher.inc.php');
+require_once(KT_LIB_DIR . '/templating/templating.inc.php');
+require_once(KT_LIB_DIR . '/mime.inc.php');
+
+class IndexErrorsDispatcher extends KTAdminDispatcher {
+
+    function check() {
+        $this->aBreadcrumbs[] = array(
+            'url' => $_SERVER['PHP_SELF'],
+            'name' => _kt('Document Indexing Diagnostics'),
+        );
+        return parent::check();
+    }
+
+    function do_main() {
+
+        //registerTypes registers the mime types and populates the needed tables.
+        $indexer = Indexer::get();
+        $indexer->registerTypes();
+
+        if($_REQUEST['rescheduleValue'] == 'reschedule')
+        {
+
+			foreach(KTUtil::arrayGet($_REQUEST, 'index_error', array()) as $sDocId => $v)
+			{
+				Indexer::reindexDocument($sDocId);
+
+			}
+
+        }
+        else if($_REQUEST['rescheduleValue'] == 'rescheduleall')
+        {
+        	$aIndexerValues = Indexer::getIndexingQueue();
+        	foreach ($aIndexerValues as $sDocValues)
+			{
+				Indexer::reindexDocument($sDocValues['document_id']);
+			}
+
+        }
+
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplating->addLocation('Index Errors', '/plugins/search2/reporting/templates');
+
+        $oTemplate =& $oTemplating->loadTemplate('indexerrors');
+
+        $aIndexerValues = Indexer::getIndexingQueue();
+        foreach($aIndexerValues as $key=>$doc)
+        {
+        	$extractor=$indexer->getExtractor($doc['extractor']);
+        	$doc['extractor'] = $extractor->getDisplayName();
+        	$aIndexerValues[$key] = $doc;
+        }
+
+
+
+        $oTemplate->setData(array(
+            'context' => $this,
+            'index_errors' => $aIndexerValues
+
+        ));
+        return $oTemplate;
+    }
+
+
+
+}
+
+
+?>
diff --git a/plugins/search2/reporting/PendingDocuments.php b/plugins/search2/reporting/PendingDocuments.php
index d13cbe7..67a67eb 100644
--- a/plugins/search2/reporting/PendingDocuments.php
+++ b/plugins/search2/reporting/PendingDocuments.php
@@ -1,74 +1,80 @@
-<?php
-/**
- * $Id:$
- *
- * KnowledgeTree Open Source Edition
- * Document Management Made Simple
- * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
- * 
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License version 3 as published by the
- * Free Software Foundation.
- * 
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
- * details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- * 
- * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
- * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
- * 
- * The interactive user interfaces in modified source and object code versions
- * of this program must display Appropriate Legal Notices, as required under
- * Section 5 of the GNU General Public License version 3.
- * 
- * In accordance with Section 7(b) of the GNU General Public License version 3,
- * these Appropriate Legal Notices must retain the display of the "Powered by
- * KnowledgeTree" logo and retain the original copyright notice. If the display of the 
- * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
- * must display the words "Powered by KnowledgeTree" and retain the original 
- * copyright notice. 
- * Contributor( s): ______________________________________
- *
- */
- 
-require_once(KT_LIB_DIR . '/dispatcher.inc.php'); 
-require_once(KT_LIB_DIR . '/templating/templating.inc.php'); 
-
-class PendingDocumentsDispatcher extends KTAdminDispatcher 
-{
-    function check() {
-        $this->aBreadcrumbs[] = array(
-            'url' => $_SERVER['PHP_SELF'],
-            'name' => _kt('Pending Documents Indexing Queue'),
-        );
-        return parent::check();
-    }
-
-    function do_main() {
-        
-        //registerTypes registers the mime types and populates the needed tables. 
-        $indexer = Indexer::get();
-        $indexer->registerTypes();
-        
- 		$aPendingDocs = Indexer::getPendingIndexingQueue();
- 		
-        $oTemplating =& KTTemplating::getSingleton();
-        $oTemplating->addLocation('Pending Documents', '/plugins/search2/reporting/templates');
-        $oTemplate =& $oTemplating->loadTemplate('pendingdocuments');
-        
-        $oTemplate->setData(array(
-            'context' => $this,
-            'pending_docs' => $aPendingDocs
-            
-        ));
-        return $oTemplate;
-    }
-    
-}
-
-
-?>
+<?php
+/**
+ * $Id:$
+ *
+ * KnowledgeTree Open Source Edition
+ * Document Management Made Simple
+ * Copyright (C) 2004 - 2008 The Jam Warehouse Software (Pty) Limited
+ *
+ * This program is free software; you can redistribute it and/or modify it under
+ * the terms of the GNU General Public License version 3 as published by the
+ * Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more
+ * details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * You can contact The Jam Warehouse Software (Pty) Limited, Unit 1, Tramber Place,
+ * Blake Street, Observatory, 7925 South Africa. or email info@knowledgetree.com.
+ *
+ * The interactive user interfaces in modified source and object code versions
+ * of this program must display Appropriate Legal Notices, as required under
+ * Section 5 of the GNU General Public License version 3.
+ *
+ * In accordance with Section 7(b) of the GNU General Public License version 3,
+ * these Appropriate Legal Notices must retain the display of the "Powered by
+ * KnowledgeTree" logo and retain the original copyright notice. If the display of the
+ * logo is not reasonably feasible for technical reasons, the Appropriate Legal Notices
+ * must display the words "Powered by KnowledgeTree" and retain the original
+ * copyright notice.
+ * Contributor( s): ______________________________________
+ *
+ */
+
+require_once(KT_LIB_DIR . '/dispatcher.inc.php');
+require_once(KT_LIB_DIR . '/templating/templating.inc.php');
+
+class PendingDocumentsDispatcher extends KTAdminDispatcher
+{
+    function check() {
+        $this->aBreadcrumbs[] = array(
+            'url' => $_SERVER['PHP_SELF'],
+            'name' => _kt('Pending Documents Indexing Queue'),
+        );
+        return parent::check();
+    }
+
+    function do_main() {
+
+        //registerTypes registers the mime types and populates the needed tables.
+        $indexer = Indexer::get();
+        $indexer->registerTypes();
+
+ 		$aPendingDocs = Indexer::getPendingIndexingQueue();
+ 		foreach($aPendingDocs as $key=>$doc)
+ 		{
+ 			$extractor = $indexer->getExtractor($doc['extractor']);
+ 			$doc['extractor'] = $extractor->getDisplayName();
+ 			$aPendingDocs[$key] = $doc;
+ 		}
+
+        $oTemplating =& KTTemplating::getSingleton();
+        $oTemplating->addLocation('Pending Documents', '/plugins/search2/reporting/templates');
+        $oTemplate =& $oTemplating->loadTemplate('pendingdocuments');
+
+        $oTemplate->setData(array(
+            'context' => $this,
+            'pending_docs' => $aPendingDocs
+
+        ));
+        return $oTemplate;
+    }
+
+}
+
+
+?>
diff --git a/plugins/search2/reporting/templates/indexerrors.smarty b/plugins/search2/reporting/templates/indexerrors.smarty
index b120ea5..d0cc6cf 100644
--- a/plugins/search2/reporting/templates/indexerrors.smarty
+++ b/plugins/search2/reporting/templates/indexerrors.smarty
@@ -23,10 +23,8 @@
 <thead>
 	<tr>
 		<th width="10"></th>
-		<th width="80"><nobr>{i18n}Document ID{/i18n}</th>
+
 		<th ><nobr>{i18n}Filename{/i18n}</th>
-		<th width="100"><nobr>{i18n}Extension{/i18n}</th>
-		<th width="100"><nobr>{i18n}Mime Type{/i18n}</th>
 		<th width="100"><nobr>{i18n}Extractor{/i18n}</th>
 		<th width="100"><nobr>{i18n}Index Date{/i18n}</th>
 	</tr>
@@ -36,11 +34,8 @@
 {foreach key=key from=$index_errors item=indexError}
 <tr>
 	<td class="centered"><input type="checkbox" name="index_error[{$indexError.document_id}]" value="1"/></td>
-	<td>{$indexError.document_id}</td>
-	<td>{$indexError.filename|truncate:40:'...'}</td>
-	<td>{$indexError.filetypes}</td>
-	<td>{$indexError.mimetypes}</td>
-	<td>{if $pendingDocs.extractor}{$indexError.extractor}{else}<p><font color="#FF9933">{i18n}n/a{/i18n}</font></p>{/if}</td>
+	<td><a href="/view.php?fDocumentId={$pendingDocs.document_id}">{$indexError.filename|truncate:40:'...'}</a></td>
+	<td>{if $indexError.extractor}{$indexError.extractor}{else}<p><font color="#FF9933">{i18n}n/a{/i18n}</font></p>{/if}</td>
 	<td>{$indexError.indexdate}</td>
 
 </tr>
diff --git a/plugins/search2/reporting/templates/pendingdocuments.smarty b/plugins/search2/reporting/templates/pendingdocuments.smarty
index 6aa2b03..e063fcb 100644
--- a/plugins/search2/reporting/templates/pendingdocuments.smarty
+++ b/plugins/search2/reporting/templates/pendingdocuments.smarty
@@ -15,10 +15,7 @@
 
 <thead>
 <tr>
-	<th width="10"><nobr>{i18n}Document ID{/i18n}</th>
 	<th><nobr>{i18n}Filename{/i18n}</th>
-	<th width="100"><nobr>{i18n}Extension{/i18n}</th>
-	<th width="150"><nobr>{i18n}Mime Type{/i18n}</th>
 	<th width="100"><nobr>{i18n}Extractor{/i18n}</th>
 	<th width="100"><nobr>{i18n}Index Date{/i18n}</th>
 </tr>
@@ -28,10 +25,7 @@
 
 {foreach key=key from=$pending_docs item=pendingDocs}
 <tr>
-	<td><a href="/view.php?fDocumentId={$pendingDocs.document_id}">{$pendingDocs.document_id}</a></td>
-	<td>{$pendingDocs.filename|truncate:40:'...'}</td>
-	<td>{$pendingDocs.filetypes}</td>
-	<td>{$pendingDocs.mimetypes}</td>
+	<td><a href="/view.php?fDocumentId={$pendingDocs.document_id}">{$pendingDocs.filename|truncate:40:'...'}</a></td>
 	<td>{if $pendingDocs.extractor}{$pendingDocs.extractor}{else}<p><font color="#FF9933">{i18n}n/a{/i18n}</font></p>{/if}</td>
 	<td>{$pendingDocs.indexdate}</td>
 </tr>