diff --git a/lib/browse/Criteria.inc b/lib/browse/Criteria.inc
index 539c909..5c119ac 100644
--- a/lib/browse/Criteria.inc
+++ b/lib/browse/Criteria.inc
@@ -242,7 +242,8 @@ class BrowseCriterion {
     }
 
     function getWidgetBase () {
-        return strtr($this->getNamespace(), '-', '_');
+        //return strtr($this->getNamespace(), '-', '_');
+        return $this->getNamespace();
     }
 
     function getSearchTable() {
@@ -731,21 +732,21 @@ class SizeCriterion extends BrowseCriterion {
 			'M'=>'Megabytes');
 
     var $aTypeAssocs = array('B' => 1, 'KB' => 1024, 'M' => 1048576);
-    
+
     var $aCmps = array();
 
     var $aCmpAssocs = array();
 
     function SizeCriterion() {
 		$this->sDisplay = _kt('File Size');
-		
+
 		$this->aCmps = array('LT'=>_kt('Less than'),
 		       'GT'=>_kt('Greater than'),
 		       'EQ'=>_kt('Equal to'),
 		       'NEQ'=>_kt('Not equal to'));
-		       
+
 		$this->aCmpAssocs = array('LT' => '<', 'GT' => '>', 'EQ' => '=', 'NEQ' => '!=');
-		
+
     }
 
     function documentDisplay ($oDocument) {
@@ -928,7 +929,7 @@ class DateCreatedDeltaCriterion extends DateCreatedCriterion {
 
     function DateCreatedDeltaCriterion() {
 		$this->sDisplay = _kt('Date Created Delta');
-		
+
 		$this->aTypes = array('MINUTE'=>_kt('Minutes'),
 			'HOUR'=>_kt('Hours'),
 			'DAY'=>_kt('Days'),
diff --git a/lib/util/ktutil.inc b/lib/util/ktutil.inc
index 0e147e4..bb372ef 100644
--- a/lib/util/ktutil.inc
+++ b/lib/util/ktutil.inc
@@ -107,19 +107,20 @@ class KTUtil {
 		$cacheDir = $config->get('cache/cacheDirectory');
 
 		$base_url = @file_get_contents($cacheDir . '/' . KTUtil::SERVER_NAME_FILE);
+		global $default;
 
 		if (false == $base_url)
 		{
-			global $default;
 			$default->log->info("call_page: $path - cannot call script until user logs in for the first time!");
 			return;
 		}
 
-
 		$kt_url = KTUtil::kt_url();
 
 		$full_url = $kt_url . '/' . $path;
 
+		$default->log->debug("call_page: calling $full_url");
+
 		$ch = curl_init($full_url);
 		curl_setopt($ch,CURLOPT_SSL_VERIFYPEER, false);
 		curl_setopt($ch,CURLOPT_SSL_VERIFYHOST, false);
diff --git a/plugins/search2/LuceneStatisticsDashlet.php b/plugins/search2/LuceneStatisticsDashlet.php
index 33b9dce..deda094 100644
--- a/plugins/search2/LuceneStatisticsDashlet.php
+++ b/plugins/search2/LuceneStatisticsDashlet.php
@@ -101,7 +101,7 @@ class LuceneStatisticsDashlet extends KTBaseDashlet
 			$docsInIndex = $index->getDocumentsInIndex();
 
 			// we are only interested in documents that are active
-			$docsInQueue = $index->getIndexingQueue();
+			$docsInQueue = $index->getIndexingQueue(false);
 			$docsInQueue = count($docsInQueue);
 
 			$errorsInQueue = $index->getIndexingQueue(true);
diff --git a/search2/indexing/extractorCore.inc.php b/search2/indexing/extractorCore.inc.php
index 9f01d77..8b02f6a 100644
--- a/search2/indexing/extractorCore.inc.php
+++ b/search2/indexing/extractorCore.inc.php
@@ -631,21 +631,29 @@ abstract class CompositeExtractor extends DocumentExtractor
 
 		$this->sourceExtractor->setSourceFile($this->sourcefile);
 		$this->sourceExtractor->setTargetFile($intermediateFile);
+		$this->sourceExtractor->setDocument($this->getDocument());
 		$this->sourceExtractor->setMimeType($this->mimetype);
 		$this->sourceExtractor->setExtension($this->extension);
 		if (!$this->sourceExtractor->extractTextContent())
 		{
+			$this->output = $this->sourceExtractor->output;
+			@unlink($intermediateFile);
 			return false;
 		}
 		$intermediateFile = $this->sourceExtractor->getTargetFile();
 
 		$this->targetExtractor->setSourceFile($intermediateFile);
 		$this->targetExtractor->setTargetFile($this->targetfile);
+		$this->targetExtractor->setDocument($this->getDocument());
 		$this->targetExtractor->setMimeType($this->targetMimeType);
 		$this->targetExtractor->setExtension($this->targetExtension);
 		$result = $this->targetExtractor->extractTextContent();
+		if (!$result)
+		{
+			$this->output = $this->targetExtractor->output;
+		}
 
-		unlink(@$intermediateFile);
+		@unlink($intermediateFile);
 
 		return $result;
 	}
diff --git a/search2/indexing/indexerCore.inc.php b/search2/indexing/indexerCore.inc.php
index 7eec023..c146056 100644
--- a/search2/indexing/indexerCore.inc.php
+++ b/search2/indexing/indexerCore.inc.php
@@ -1012,6 +1012,20 @@ abstract class Indexer
         		$this->logPendingDocumentInfoStatus($docId, sprintf(_kt("Processing docid: %d.\n"),$docId), 'info');
         	}
 
+        	$document = Document::get($docId);
+        	if (PEAR::isError($document))
+        	{
+        		Indexer::unqueueDocument($docId,sprintf(_kt("indexDocuments: Cannot resolve document id %d: %s."),$docId, $document->getMessage()), 'error');
+        		continue;
+        	}
+
+        	$filename = $document->getFileName();
+        	if (substr($filename,0,1) == '~')
+        	{
+        		Indexer::unqueueDocument($docId,sprintf(_kt("indexDocuments: Filename for document id %d starts with a tilde (~). This is assumed to be a temporary file. This is ignored."),$docId), 'error');
+        		continue;
+        	}
+
         	$removeFromQueue = true;
         	if ($indexDocument)
         	{
@@ -1030,12 +1044,7 @@ abstract class Indexer
 					continue;
 				}
 
-        		$document = Document::get($docId);
-        		if (PEAR::isError($document))
-        		{
-        			Indexer::unqueueDocument($docId,sprintf(_kt("indexDocuments: Cannot resolve document id %d: %s."),$docId, $document->getMessage()), 'error');
-        			continue;
-        		}
+
 
         		$version = $document->getMajorVersionNumber() . '.' . $document->getMinorVersionNumber();
         		$sourceFile = $storageManager->temporaryFile($document);