diff --git a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
index b4e52a0f3c..2d1941968f 100755
--- a/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
+++ b/Core/src/org/sleuthkit/autopsy/directorytree/DataResultFilterNode.java
@@ -32,6 +32,7 @@ import javax.swing.AbstractAction;
 import javax.swing.Action;
 import org.openide.explorer.ExplorerManager;
 import org.openide.nodes.AbstractNode;
+import org.openide.nodes.ChildFactory;
 import org.openide.nodes.FilterNode;
 import org.openide.nodes.Node;
 import org.openide.nodes.Sheet;
@@ -130,11 +131,13 @@ public class DataResultFilterNode extends FilterNode {
      */
     @Override
     public Action getPreferredAction() {
-        // double click action(s) for volume node or directory node
-
-        final DisplayableItemNode originalNode;
-        originalNode = (DisplayableItemNode) this.getOriginal();
-
+        final Node original = this.getOriginal();
+        // Once had a org.openide.nodes.ChildFactory$WaitFilterNode passed in
+        if ((original instanceof DisplayableItemNode) == false) {
+            return null;
+        }
+        
+        final DisplayableItemNode originalNode = (DisplayableItemNode) this.getOriginal();
         return originalNode.accept(getPreferredActionsDIV);
     }
 
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
index 5283d5c04f..a5cdb368e7 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/FileExtMismatchXML.java
@@ -23,8 +23,8 @@ import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.logging.Level;
 import javax.xml.parsers.DocumentBuilder;
@@ -33,7 +33,6 @@ import javax.xml.parsers.ParserConfigurationException;
 import org.sleuthkit.autopsy.coreutils.Logger;
 import org.sleuthkit.autopsy.coreutils.PlatformUtil;
 import org.sleuthkit.autopsy.coreutils.XMLUtil;
-import org.sleuthkit.datamodel.BlackboardAttribute;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
@@ -143,7 +142,7 @@ class FileExtMismatchXML {
      * @return Loaded hash map or null on error or null if data does not exist
      */
     public boolean save(HashMap<String, String[]> sigTypeToExtMap) {    
-        boolean success = false;
+        boolean success;
 
         DocumentBuilderFactory dbfac = DocumentBuilderFactory.newInstance();
 
@@ -154,16 +153,17 @@ class FileExtMismatchXML {
             Element rootEl = doc.createElement(ROOT_EL);
             doc.appendChild(rootEl);
             
-            Iterator<String> keyIt = sigTypeToExtMap.keySet().iterator();
+            ArrayList<String> appTypeList = new ArrayList<>(sigTypeToExtMap.keySet());
+            Collections.sort(appTypeList);
             
-            while (keyIt.hasNext()) {
-                String key = keyIt.next();
+            for (String appType : appTypeList) {
                 Element sigEl = doc.createElement(SIG_EL);
-                sigEl.setAttribute(SIG_MIMETYPE_ATTR, key);
+                sigEl.setAttribute(SIG_MIMETYPE_ATTR, appType);
                 
-                String[] extArray = sigTypeToExtMap.get(key);
+                String[] extArray = sigTypeToExtMap.get(appType);
                 if (extArray != null) {
                     ArrayList<String> extList = new ArrayList<>(Arrays.asList(extArray));
+                    Collections.sort(extList);
                     for (String ext : extList) {
                         Element extEl = doc.createElement(EXT_EL);
                         extEl.setTextContent(ext);
diff --git a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
index 8c88fcb430..d689d2f6b9 100644
--- a/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
+++ b/FileExtMismatch/src/org/sleuthkit/autopsy/fileextmismatch/mismatch_config.xml
@@ -1,444 +1,445 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <mismatch_config>
-	<!-- Applications/Miscellaneous -->
-    <signature mimetype="text/plain">
-        <ext>txt</ext>
-        <ext>ini</ext>
-        <ext>inf</ext>
-        <ext>url</ext>
-        <ext>reg</ext>
-        <ext>cfg</ext>
-        <ext>log</ext>
-        <ext>lo_</ext>
-        <ext>dat</ext>
-        <ext>lst</ext>
-        <ext>xml</ext>
-        <ext>dtd</ext>
-        <ext>xsd</ext>
-        <ext>xdr</ext>
-        <ext>xsl</ext>
-        <ext>xsml</ext>
-        <ext>kml</ext>
-        <ext>wsdl</ext>
-        <ext>box</ext>
-        <ext>rdf</ext>
-        <ext>manifest</ext>
-        <ext>htm</ext>
-        <ext>html</ext>
-        <ext>shtml</ext>
-        <ext>shtm</ext>
-        <ext>xhtml</ext>
-        <ext>hta</ext>
-        <ext>css</ext>
-        <ext>js</ext>
-        <ext>jsm</ext>
-        <ext>vbs</ext>
-        <ext>vb</ext>
-        <ext>php</ext>
-        <ext>php3</ext>
-        <ext>phtml</ext>
-        <ext>h</ext>
-        <ext>hpp</ext>
-        <ext>hxx</ext>
-        <ext>cpp</ext>
-        <ext>cxx</ext>
-        <ext>cc</ext>
-        <ext>c</ext>
-        <ext>java</ext>
-        <ext>cs</ext>
-        <ext>asp</ext>
-        <ext>aspx</ext>
-        <ext>axd</ext>
-        <ext>ashx</ext>
-        <ext>properties</ext>
-        <ext>mak</ext>
-        <ext>cmake</ext>
-        <ext>la</ext>
-        <ext>pl</ext>
-        <ext>pm</ext>
-        <ext>plx</ext>
-        <ext>py</ext>
-        <ext>pyw</ext>
-        <ext>bat</ext>
-        <ext>lua</ext>
-        <ext>tex</ext>
-        <ext>lsp</ext>
-        <ext>lisp</ext>
-        <ext>rb</ext>
-        <ext>rbw</ext>
-        <ext>ps</ext>
-        <ext>json</ext>
-        <ext>mof</ext>
-        <ext>mfl</ext>
-        <ext>inc</ext>
-        <ext>milk</ext>
-        <ext>acro</ext>
-        <ext>adm</ext>
-        <ext>dun</ext>
-        <ext>obe</ext>
-        <ext>pro</ext>
-        <ext>sam</ext>
-        <ext>cmd</ext>
-        <ext>rat</ext>
-        <ext>htt</ext>
-        <ext>iem</ext>
-        <ext>policy</ext>
-        <ext>pc</ext>
-        <ext>catalog</ext>
-        <ext>hlp</ext>
-        <ext>cnt</ext>
-        <ext>sql</ext>
-        <ext>rbf</ext>
-        <ext>rsp</ext>
-        <ext>wpl</ext>
-        <ext>dic</ext>
-        <ext>aff</ext>
-        <ext>iqy</ext>
-        <ext>ecf</ext>
-        <ext>elm</ext>
-        <ext>ent</ext>
-        <ext>gdl</ext>
-        <ext>gpd</ext>
-        <ext>isp</ext>
-        <ext>theme</ext>
-        <ext>nt</ext>
-        <ext>cty</ext>
-        <ext>icw</ext>
-        <ext>man</ext>
-        <ext>ppd</ext>
-        <ext>cpx</ext>
-        <ext>scp</ext>
-        <ext>ver</ext>
-        <ext>library-ms</ext>
-        <ext>winprf</ext>
-        <ext>winprf_backup</ext>
-        <ext>svg</ext>
-		<ext>psp</ext>
-		<ext>jsp</ext>
-		<ext>oem</ext>
-		<ext>map</ext>
-		<ext>det</ext>
-		<ext>ins</ext>
-		<ext>ph</ext>
-		<ext>prx</ext>
-		<ext>sif</ext>
-		<ext>idl</ext>
-		<ext>isl</ext>
-		<ext>nld</ext>
-		<ext>sve</ext>
-		<ext>ita</ext>
-		<ext>fra</ext>
-		<ext>esn</ext>
-		<ext>enu</ext>
-		<ext>deu</ext>
-		<ext>sep</ext>
-		<ext>sve</ext>
-		<ext>cht</ext>
-		<ext>chs</ext>
-		<ext>psm</ext>
-		<ext>rq0</ext>
-		<ext>old</ext>
-	    <ext>eng</ext>
-		<ext>dlg</ext>
-		<ext>org</ext>
-		<ext>ic</ext>
-		<ext>ths</ext>
-		<ext>sig</ext>
-		<ext>std</ext>
-		<ext>cmp</ext>
-		<ext>stp</ext>
-		<ext>rst</ext>
-		<ext>lng</ext>
-		<ext>xdc</ext>
-		<ext>tha</ext>
-    </signature>sys
-    <signature mimetype="application/x-msoffice">
-        <ext>doc</ext>
-        <ext>docx</ext>
-        <ext>docm</ext>
-        <ext>dotm</ext>
-        <ext>dot</ext>
-        <ext>dotx</ext>
-        <ext>xls</ext>
-        <ext>xlt</ext>
-        <ext>xla</ext>
-        <ext>xlsx</ext>
-        <ext>xlsm</ext>
-        <ext>xltm</ext>
-        <ext>xlam</ext>
-        <ext>xlsb</ext>
-        <ext>ppt</ext>
-        <ext>pot</ext>
-        <ext>pps</ext>
-        <ext>ppa</ext>
-        <ext>pptx</ext>
-        <ext>potx</ext>
-        <ext>ppam</ext>
-        <ext>pptm</ext>
-        <ext>potm</ext>
-        <ext>ppsm</ext>
-        <ext>msi</ext>
-        <ext>mst</ext>
-        <ext>db</ext>
-        <ext>db.keep</ext>
-        <ext>wiz</ext>
-        <ext>gra</ext>
-        <ext>automaticDestinations-ms</ext>
-        <ext>customDestinations-ms</ext>
-        <ext>feed-ms</ext>
-    </signature>
-    <signature mimetype="application/x-ooxml">
-        <ext>docx</ext>
-        <ext>dotx</ext>
-        <ext>xlsx</ext>
-        <ext>xlsm</ext>
-        <ext>xltm</ext>
-        <ext>xlam</ext>
-        <ext>xlsb</ext>
-        <ext>pptx</ext>
-        <ext>potx</ext>
-        <ext>ppam</ext>
-        <ext>pptm</ext>
-        <ext>potm</ext>
-        <ext>ppsm</ext>    
-    </signature>
-    <signature mimetype="application/msword">
-        <ext>doc</ext>
-        <ext>dot</ext>
-    </signature>
-    <signature mimetype="application/vnd.ms-excel">
-        <ext>xls</ext>
-        <ext>xlt</ext>
-        <ext>xla</ext>
-    </signature>
-    <signature mimetype="application/vnd.ms-powerpoint">
-        <ext>ppt</ext>
-        <ext>pot</ext>
-        <ext>pps</ext>
-        <ext>ppa</ext>
-    </signature>
-    <signature mimetype="application/zip">
-        <ext>zip</ext>
-        <ext>docx</ext>
-        <ext>dotx</ext>
-        <ext>xlsx</ext>
-        <ext>xlsm</ext>
-        <ext>xltm</ext>
-        <ext>xlam</ext>
-        <ext>xlsb</ext>
-        <ext>pptx</ext>
-        <ext>potx</ext>
-        <ext>ppam</ext>        
-        <ext>pptm</ext>
-        <ext>potm</ext>
-        <ext>ppsm</ext>
-        <ext>wmz</ext>
-        <ext>jar</ext>
-        <ext>amo</ext>
-        <ext>xpi</ext>
-    </signature>
-    <signature mimetype="application/vnd.oasis.opendocument.text">
-        <ext>odt</ext>
-    </signature>
-    <signature mimetype="application/vnd.oasis.opendocument.spreadsheet">
-        <ext>ods</ext>        
-    </signature>
-    <signature mimetype="application/vnd.oasis.opendocument.presentation">
-        <ext>odp</ext>        
-    </signature>
-    <signature mimetype="application/pdf">
-        <ext>pdf</ext>        
-    </signature>
-    <signature mimetype="application/rtf">
-        <ext>rtf</ext>        
-    </signature>
-    <signature mimetype="text/html">
-        <ext>htm</ext>
-        <ext>html</ext>
-        <ext>htx</ext>
-        <ext>htmls</ext>
-        <ext>hhk</ext>
-        <ext>hta</ext>
-        <ext>wpl</ext>
-        <ext>htt</ext>
-	    <ext>shtml</ext>
-    </signature> 
-	<!-- Images -->
-    <signature mimetype="image/jpeg">
-        <ext>jpg</ext>        
-        <ext>jpeg</ext>   
-        <ext>jpe</ext>        
-        <ext>jif</ext>   
-        <ext>jfif</ext>        
-        <ext>jfi</ext>   		
-    </signature>
-    <signature mimetype="image/vnd.adobe.photoshop">
-        <ext>psd</ext>              
-    </signature>
-	<signature mimetype="image/x-raw-nikon">
-        <ext>nef</ext>              
-    </signature>
-    <signature mimetype="image/tiff">
-        <ext>tif</ext>
-        <ext>tiff</ext>        
-    </signature>
-    <signature mimetype="image/png">
-        <ext>png</ext>        
-    </signature>                        
-    <signature mimetype="image/gif">
-        <ext>gif</ext>        
-    </signature>     
-    <signature mimetype="image/x-ms-bmp">
-        <ext>bmp</ext>        
-    </signature>     
-    <signature mimetype="image/bmp">
-        <ext>bmp</ext>        
-        <ext>bm</ext>                
-    </signature>                 
-    <signature mimetype="image/x-icon">
-        <ext>ico</ext>        
-    </signature>     
-	<!-- Video -->
-    <signature mimetype="video/mp4">
-        <ext>mp4</ext>        
-		<ext>m4r</ext>  
-    </signature>     
-    <signature mimetype="video/quicktime">
-        <ext>mov</ext>        
-        <ext>qt</ext>        
-        <ext>mp4</ext>                        
-    </signature>
-    <signature mimetype="application/vnd.rn-realmedia">
-        <ext>rm</ext>                         
-    </signature>	
-    <signature mimetype="video/3gpp">
-        <ext>3gp</ext>        
-    </signature>     
-    <signature mimetype="video/x-msvideo">
-        <ext>avi</ext>        
-    </signature>                         
-    <signature mimetype="video/x-ms-wmv">
-        <ext>wmv</ext>
-    </signature>
-    <signature mimetype="application/vnd.ms-asf">
-        <ext>wmv</ext>
-        <ext>asf</ext>
-    </signature>    
-    <signature mimetype="video/x-ms-asf">
-        <ext>wmv</ext>
-        <ext>asf</ext>
-		<ext>wma</ext>
-    </signature>
-    <signature mimetype="audio/x-ms-wma">
-        <ext>wma</ext>
-        <ext>asf</ext>
-    </signature>
-    <signature mimetype="video/mpeg">
-        <ext>mpg</ext>                
-        <ext>mpeg</ext>        
-        <ext>m1v</ext>        
-        <ext>m2v</ext>       
-        <ext>mpe</ext>        
-        <ext>mpv</ext>        
-    </signature>                         
-    <signature mimetype="video/x-flv">
-        <ext>flv</ext>        
-    </signature>   
-	<signature mimetype="video/x-m4v">
-        <ext>m4v</ext>        
-    </signature>   	
-    <signature mimetype="application/vnd.rn-realmedia">
-        <ext>rm</ext>        
-    </signature>                                         
-    <signature mimetype="application/vnd.rn-realvideo">
-        <ext>rv</ext>        
-    </signature>                         
-    <signature mimetype="application/x-shockwave-flash">
-        <ext>swf</ext>        
-    </signature> 
-	<!-- Audio -->
-	<signature mimetype="audio/x-aiff">
-        <ext>aif</ext>
-		<ext>aiff</ext>
-    </signature> 
-	<signature mimetype="audio/aiff">
-        <ext>aif</ext>
-		<ext>aiff</ext>
-    </signature> 
-	<signature mimetype="audio/x-flac">
-        <ext>flac</ext>
-    </signature> 
-	<signature mimetype="audio/x-wav">
-        <ext>wav</ext>
-    </signature> 
-	<signature mimetype="audio/mp4">
-        <ext>m4a</ext>
-		<ext>mp4</ext>
-    </signature> 
-	<signature mimetype="audio/mpeg">
-        <ext>mp2</ext>
-		<ext>mp3</ext>
-		<ext>mpa</ext>
-		<ext>m2a</ext>
-    </signature> 
-	<signature mimetype="audio/x-aac">
-        <ext>aac</ext>
-    </signature> 
-	<signature mimetype="audio/mpa">
-        <ext>mp2</ext>
-		<ext>mp3</ext>
-		<ext>mpa</ext>
-		<ext>m2a</ext>
-    </signature>
-	<signature mimetype="audio/x-mpeg">
-        <ext>mp2</ext>
-		<ext>mp3</ext>
-		<ext>mpa</ext>
-		<ext>m2a</ext>
-    </signature>
-	<signature mimetype="audio/x-mpegurl">
-        <ext>m3u</ext>
-    </signature> 
-	<signature mimetype="audio/midi">
-        <ext>mid</ext>
-		<ext>midi</ext>
-	</signature> 
-	<signature mimetype="audio/ogg">
-        <ext>ogg</ext>
-    </signature> 
-	<!-- File Compression -->
-	<signature mimetype="application/x-rar-compressed">
-        <ext>rar</ext>
-    </signature> 
-	<signature mimetype="application/x-arj">
-        <ext>arj</ext>
-    </signature> 
-	<signature mimetype="application/x-tar">
-        <ext>tar</ext>
-    </signature> 
-	<signature mimetype="application/x-gzip">
-        <ext>gz</ext>
-		<ext>gzip</ext>
-		<ext>tgz</ext>
-    </signature> 
-	<signature mimetype="application/x-bzip">
-        <ext>bzip</ext>
-		<ext>bz</ext>
-    </signature>  
-	<signature mimetype="application/vnd.ms-cab-compressed">
-        <ext>cab</ext>
-    </signature> 
-	<signature mimetype="application/java-archive">
-        <ext>jar</ext>
-    </signature> 
-	<signature mimetype="application/x-bzip2">
-        <ext>bzip2</ext>
-    </signature> 
-	<signature mimetype="application/x-cpio">
-        <ext>cpio</ext>
-    </signature> 
-	<!-- Executables -->
-    <signature mimetype="application/x-dosexec">
-        <ext>exe</ext>
-    </signature> 	
-</mismatch_config>
\ No newline at end of file
+ <signature mimetype="application/java-archive">
+  <ext>jar</ext>
+ </signature>
+ <signature mimetype="application/msword">
+  <ext>doc</ext>
+  <ext>dot</ext>
+ </signature>
+ <signature mimetype="application/pdf">
+  <ext>pdf</ext>
+ </signature>
+ <signature mimetype="application/rtf">
+  <ext>doc</ext>
+  <ext>rtf</ext>
+ </signature>
+ <signature mimetype="application/vnd.ms-asf">
+  <ext>asf</ext>
+  <ext>wmv</ext>
+ </signature>
+ <signature mimetype="application/vnd.ms-cab-compressed">
+  <ext>cab</ext>
+ </signature>
+ <signature mimetype="application/vnd.ms-excel">
+  <ext>xla</ext>
+  <ext>xls</ext>
+  <ext>xlt</ext>
+ </signature>
+ <signature mimetype="application/vnd.ms-powerpoint">
+  <ext>pot</ext>
+  <ext>ppa</ext>
+  <ext>pps</ext>
+  <ext>ppt</ext>
+ </signature>
+ <signature mimetype="application/vnd.oasis.opendocument.presentation">
+  <ext>odp</ext>
+ </signature>
+ <signature mimetype="application/vnd.oasis.opendocument.spreadsheet">
+  <ext>ods</ext>
+ </signature>
+ <signature mimetype="application/vnd.oasis.opendocument.text">
+  <ext>odt</ext>
+ </signature>
+ <signature mimetype="application/vnd.rn-realmedia">
+  <ext>rm</ext>
+ </signature>
+ <signature mimetype="application/vnd.rn-realvideo">
+  <ext>rv</ext>
+ </signature>
+ <signature mimetype="application/x-arj">
+  <ext>arj</ext>
+ </signature>
+ <signature mimetype="application/x-bzip">
+  <ext>bz</ext>
+  <ext>bzip</ext>
+ </signature>
+ <signature mimetype="application/x-bzip2">
+  <ext>bzip2</ext>
+ </signature>
+ <signature mimetype="application/x-cpio">
+  <ext>cpio</ext>
+ </signature>
+ <signature mimetype="application/x-dosexec">
+  <ext>exe</ext>
+ </signature>
+ <signature mimetype="application/x-gzip">
+  <ext>gz</ext>
+  <ext>gzip</ext>
+  <ext>tgz</ext>
+ </signature>
+ <signature mimetype="application/x-msoffice">
+  <ext>automaticDestinations-ms</ext>
+  <ext>customDestinations-ms</ext>
+  <ext>db</ext>
+  <ext>db.keep</ext>
+  <ext>doc</ext>
+  <ext>docm</ext>
+  <ext>docx</ext>
+  <ext>dot</ext>
+  <ext>dotm</ext>
+  <ext>dotx</ext>
+  <ext>feed-ms</ext>
+  <ext>gra</ext>
+  <ext>msi</ext>
+  <ext>mst</ext>
+  <ext>pot</ext>
+  <ext>potm</ext>
+  <ext>potx</ext>
+  <ext>ppa</ext>
+  <ext>ppam</ext>
+  <ext>pps</ext>
+  <ext>ppsm</ext>
+  <ext>ppt</ext>
+  <ext>pptm</ext>
+  <ext>pptx</ext>
+  <ext>wiz</ext>
+  <ext>xla</ext>
+  <ext>xlam</ext>
+  <ext>xls</ext>
+  <ext>xlsb</ext>
+  <ext>xlsm</ext>
+  <ext>xlsx</ext>
+  <ext>xlt</ext>
+  <ext>xltm</ext>
+ </signature>
+ <signature mimetype="application/x-ooxml">
+  <ext>docx</ext>
+  <ext>dotx</ext>
+  <ext>potm</ext>
+  <ext>potx</ext>
+  <ext>ppam</ext>
+  <ext>ppsm</ext>
+  <ext>pptm</ext>
+  <ext>pptx</ext>
+  <ext>xlam</ext>
+  <ext>xlsb</ext>
+  <ext>xlsm</ext>
+  <ext>xlsx</ext>
+  <ext>xltm</ext>
+ </signature>
+ <signature mimetype="application/x-rar-compressed">
+  <ext>rar</ext>
+ </signature>
+ <signature mimetype="application/x-shockwave-flash">
+  <ext>swf</ext>
+ </signature>
+ <signature mimetype="application/x-tar">
+  <ext>tar</ext>
+ </signature>
+ <signature mimetype="application/zip">
+  <ext>amo</ext>
+  <ext>docx</ext>
+  <ext>dotx</ext>
+  <ext>jar</ext>
+  <ext>kmz</ext>
+  <ext>potm</ext>
+  <ext>potx</ext>
+  <ext>ppam</ext>
+  <ext>ppsm</ext>
+  <ext>pptm</ext>
+  <ext>pptx</ext>
+  <ext>wmz</ext>
+  <ext>xlam</ext>
+  <ext>xlsb</ext>
+  <ext>xlsm</ext>
+  <ext>xlsx</ext>
+  <ext>xltm</ext>
+  <ext>xpi</ext>
+  <ext>zip</ext>
+ </signature>
+ <signature mimetype="audio/aiff">
+  <ext>aif</ext>
+  <ext>aiff</ext>
+ </signature>
+ <signature mimetype="audio/midi">
+  <ext>mid</ext>
+  <ext>midi</ext>
+ </signature>
+ <signature mimetype="audio/mp4">
+  <ext>m4a</ext>
+  <ext>mp4</ext>
+ </signature>
+ <signature mimetype="audio/mpa">
+  <ext>m2a</ext>
+  <ext>mp2</ext>
+  <ext>mp3</ext>
+  <ext>mpa</ext>
+ </signature>
+ <signature mimetype="audio/mpeg">
+  <ext>m2a</ext>
+  <ext>mp2</ext>
+  <ext>mp3</ext>
+  <ext>mpa</ext>
+  <ext>raw</ext>
+ </signature>
+ <signature mimetype="audio/ogg">
+  <ext>ogg</ext>
+ </signature>
+ <signature mimetype="audio/x-aac">
+  <ext>aac</ext>
+ </signature>
+ <signature mimetype="audio/x-aiff">
+  <ext>aif</ext>
+  <ext>aiff</ext>
+ </signature>
+ <signature mimetype="audio/x-flac">
+  <ext>flac</ext>
+ </signature>
+ <signature mimetype="audio/x-mpeg">
+  <ext>m2a</ext>
+  <ext>mp2</ext>
+  <ext>mp3</ext>
+  <ext>mpa</ext>
+ </signature>
+ <signature mimetype="audio/x-mpegurl">
+  <ext>m3u</ext>
+ </signature>
+ <signature mimetype="audio/x-ms-wma">
+  <ext>asf</ext>
+  <ext>wma</ext>
+ </signature>
+ <signature mimetype="audio/x-wav">
+  <ext>wav</ext>
+ </signature>
+ <signature mimetype="image/bmp">
+  <ext>bm</ext>
+  <ext>bmp</ext>
+ </signature>
+ <signature mimetype="image/gif">
+  <ext>gif</ext>
+ </signature>
+ <signature mimetype="image/jpeg">
+  <ext>jfi</ext>
+  <ext>jfif</ext>
+  <ext>jif</ext>
+  <ext>jpe</ext>
+  <ext>jpeg</ext>
+  <ext>jpg</ext>
+ </signature>
+ <signature mimetype="image/png">
+  <ext>png</ext>
+ </signature>
+ <signature mimetype="image/tiff">
+  <ext>tif</ext>
+  <ext>tiff</ext>
+ </signature>
+ <signature mimetype="image/vnd.adobe.photoshop">
+  <ext>psd</ext>
+ </signature>
+ <signature mimetype="image/x-icon">
+  <ext>ico</ext>
+ </signature>
+ <signature mimetype="image/x-ms-bmp">
+  <ext>bmp</ext>
+ </signature>
+ <signature mimetype="image/x-raw-nikon">
+  <ext>nef</ext>
+ </signature>
+ <signature mimetype="text/html">
+  <ext>hhk</ext>
+  <ext>hta</ext>
+  <ext>htm</ext>
+  <ext>html</ext>
+  <ext>htmls</ext>
+  <ext>htt</ext>
+  <ext>htx</ext>
+  <ext>shtml</ext>
+  <ext>wpl</ext>
+  <ext>xml</ext>
+ </signature>
+ <signature mimetype="text/plain">
+  <ext>acro</ext>
+  <ext>adm</ext>
+  <ext>aff</ext>
+  <ext>arff</ext>
+  <ext>ashx</ext>
+  <ext>asp</ext>
+  <ext>aspx</ext>
+  <ext>axd</ext>
+  <ext>bat</ext>
+  <ext>bau</ext>
+  <ext>box</ext>
+  <ext>c</ext>
+  <ext>catalog</ext>
+  <ext>cc</ext>
+  <ext>cfg</ext>
+  <ext>chs</ext>
+  <ext>cht</ext>
+  <ext>cmake</ext>
+  <ext>cmd</ext>
+  <ext>cmp</ext>
+  <ext>cnt</ext>
+  <ext>cpp</ext>
+  <ext>cpx</ext>
+  <ext>cs</ext>
+  <ext>css</ext>
+  <ext>csv</ext>
+  <ext>cty</ext>
+  <ext>cxx</ext>
+  <ext>dat</ext>
+  <ext>det</ext>
+  <ext>deu</ext>
+  <ext>dic</ext>
+  <ext>dlg</ext>
+  <ext>doc</ext>
+  <ext>dtd</ext>
+  <ext>dun</ext>
+  <ext>ecf</ext>
+  <ext>elm</ext>
+  <ext>eng</ext>
+  <ext>ent</ext>
+  <ext>enu</ext>
+  <ext>esn</ext>
+  <ext>fra</ext>
+  <ext>gdl</ext>
+  <ext>gpd</ext>
+  <ext>h</ext>
+  <ext>hlp</ext>
+  <ext>hpp</ext>
+  <ext>hta</ext>
+  <ext>htm</ext>
+  <ext>html</ext>
+  <ext>htt</ext>
+  <ext>hxx</ext>
+  <ext>ic</ext>
+  <ext>icw</ext>
+  <ext>idl</ext>
+  <ext>iem</ext>
+  <ext>inc</ext>
+  <ext>inf</ext>
+  <ext>ini</ext>
+  <ext>ins</ext>
+  <ext>iqy</ext>
+  <ext>isl</ext>
+  <ext>isp</ext>
+  <ext>ita</ext>
+  <ext>java</ext>
+  <ext>js</ext>
+  <ext>jsm</ext>
+  <ext>json</ext>
+  <ext>jsp</ext>
+  <ext>kml</ext>
+  <ext>la</ext>
+  <ext>library-ms</ext>
+  <ext>lisp</ext>
+  <ext>lng</ext>
+  <ext>lo_</ext>
+  <ext>log</ext>
+  <ext>lsp</ext>
+  <ext>lst</ext>
+  <ext>lua</ext>
+  <ext>mak</ext>
+  <ext>man</ext>
+  <ext>manifest</ext>
+  <ext>map</ext>
+  <ext>mfl</ext>
+  <ext>milk</ext>
+  <ext>mof</ext>
+  <ext>nld</ext>
+  <ext>nt</ext>
+  <ext>obe</ext>
+  <ext>oem</ext>
+  <ext>old</ext>
+  <ext>org</ext>
+  <ext>pc</ext>
+  <ext>ph</ext>
+  <ext>php</ext>
+  <ext>php3</ext>
+  <ext>phtml</ext>
+  <ext>pl</ext>
+  <ext>plx</ext>
+  <ext>pm</ext>
+  <ext>policy</ext>
+  <ext>ppd</ext>
+  <ext>pro</ext>
+  <ext>properties</ext>
+  <ext>prx</ext>
+  <ext>ps</ext>
+  <ext>psm</ext>
+  <ext>psp</ext>
+  <ext>py</ext>
+  <ext>pyw</ext>
+  <ext>rat</ext>
+  <ext>rb</ext>
+  <ext>rbf</ext>
+  <ext>rbw</ext>
+  <ext>rdf</ext>
+  <ext>reg</ext>
+  <ext>rq0</ext>
+  <ext>rsp</ext>
+  <ext>rst</ext>
+  <ext>s</ext>
+  <ext>sam</ext>
+  <ext>scp</ext>
+  <ext>sep</ext>
+  <ext>shtm</ext>
+  <ext>shtml</ext>
+  <ext>sif</ext>
+  <ext>sig</ext>
+  <ext>sql</ext>
+  <ext>std</ext>
+  <ext>stp</ext>
+  <ext>sve</ext>
+  <ext>sve</ext>
+  <ext>svg</ext>
+  <ext>tex</ext>
+  <ext>text</ext>
+  <ext>tha</ext>
+  <ext>theme</ext>
+  <ext>ths</ext>
+  <ext>txt</ext>
+  <ext>url</ext>
+  <ext>vb</ext>
+  <ext>vbs</ext>
+  <ext>ver</ext>
+  <ext>winprf</ext>
+  <ext>winprf_backup</ext>
+  <ext>wpl</ext>
+  <ext>wsdl</ext>
+  <ext>xdc</ext>
+  <ext>xdr</ext>
+  <ext>xhtml</ext>
+  <ext>xml</ext>
+  <ext>xsd</ext>
+  <ext>xsl</ext>
+  <ext>xsml</ext>
+ </signature>
+ <signature mimetype="video/3gpp">
+  <ext>3gp</ext>
+ </signature>
+ <signature mimetype="video/mp4">
+  <ext>m4r</ext>
+  <ext>mp4</ext>
+ </signature>
+ <signature mimetype="video/mpeg">
+  <ext>m1v</ext>
+  <ext>m2v</ext>
+  <ext>mpe</ext>
+  <ext>mpeg</ext>
+  <ext>mpg</ext>
+  <ext>mpv</ext>
+ </signature>
+ <signature mimetype="video/quicktime">
+  <ext>mov</ext>
+  <ext>mp4</ext>
+  <ext>qt</ext>
+ </signature>
+ <signature mimetype="video/x-flv">
+  <ext>flv</ext>
+ </signature>
+ <signature mimetype="video/x-m4v">
+  <ext>m4v</ext>
+ </signature>
+ <signature mimetype="video/x-ms-asf">
+  <ext>asf</ext>
+  <ext>wma</ext>
+  <ext>wmv</ext>
+ </signature>
+ <signature mimetype="video/x-ms-wmv">
+  <ext>wmv</ext>
+ </signature>
+ <signature mimetype="video/x-msvideo">
+  <ext>avi</ext>
+ </signature>
+</mismatch_config>
diff --git a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java
index 4d902037cb..8ab655e27b 100644
--- a/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java
+++ b/FileTypeId/src/org/sleuthkit/autopsy/filetypeid/TikaFileTypeDetector.java
@@ -38,11 +38,26 @@ class TikaFileTypeDetector implements FileTypeDetectionInterface {
             byte buffer[] = new byte[maxBytesInitial];
             int len = abstractFile.read(buffer, 0, maxBytesInitial);        
 
+            boolean found = false;
             try {
-                String mimetype = tikaInst.detect(buffer);
+                // the xml detection in Tika tries to parse the entire file and throws exceptions
+                // for files that are not complete
+                try {
+                    String tagHeader = new String(buffer, 0, 5);
+                    if (tagHeader.equals("<?xml")) {
+                        ret.type = "text/xml";
+                        found = true;
+                    }
+                }
+                catch (IndexOutOfBoundsException e) {
+                    // do nothing
+                }
                 
-                // Remove tika's name out of the general types like msoffice and ooxml
-                ret.type = mimetype.replace("tika-", "");
+                if (found == false) {
+                    String mimetype = tikaInst.detect(buffer);
+                    // Remove tika's name out of the general types like msoffice and ooxml
+                    ret.type = mimetype.replace("tika-", "");
+                }
             } catch (Exception ex) {
                 //do nothing
             }
diff --git a/docs/doxygen/main.dox b/docs/doxygen/main.dox
index fa1fc66cb8..42f1ffd15a 100644
--- a/docs/doxygen/main.dox
+++ b/docs/doxygen/main.dox
@@ -3,6 +3,8 @@
 <h3>Overview</h3>
 Autopsy has been designed as a platform for open source tools besides just The Sleuth Kit.  This document is for developers who want to add functionality into Autopsy.  This could be in the form of enhancing the existing functionality or by making a module that plugs into it and you may distribute from your own site or push it back into the base distribution. 
 
+If these pages don't answer your question, then send the question to The Sleuth Kit Developer's List (https://lists.sourceforge.net/lists/listinfo/sleuthkit-developers). 
+
 If you want to write modules, then these pages are for you:
 - \subpage platform_page
 - \subpage mod_dev_page