diff --git a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
index f7a0caf935..5b59f12812 100644
--- a/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
+++ b/Core/src/org/sleuthkit/autopsy/corecomponents/DataResultViewerTable.java
@@ -343,10 +343,11 @@ public class DataResultViewerTable extends AbstractDataResultViewer {
                 //int scrollWidth = ttv.getWidth();
                 int margin = 4;
                 int startColumn = 1;
-                if (props.size() > 0) {
-                    ov.getOutline().setAutoResizeMode(JTable.AUTO_RESIZE_OFF);
-                }
-
+                
+                // If there is only one column (which was removed from props above)
+                // Just let the table resize itself.
+                ov.getOutline().setAutoResizeMode((props.size() > 0) ? JTable.AUTO_RESIZE_OFF : JTable.AUTO_RESIZE_ALL_COLUMNS);
+                
 
 
                 // get first 100 rows values for the table
diff --git a/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java b/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
index 75c0c1c75f..3d4f792e87 100644
--- a/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
+++ b/Core/src/org/sleuthkit/autopsy/ingest/GeneralIngestConfigurator.java
@@ -65,6 +65,9 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
         String[] enabledModuleNames = ModuleSettings.getConfigSetting(moduleContext, ENABLED_INGEST_MODULES_KEY).split(", ");
         List<IngestModuleAbstract> enabledModules = new ArrayList<>();
         for (String moduleName : enabledModuleNames) {
+            if (moduleName.equals("Thunderbird Parser")) {
+                moduleName = "MBox Parser";
+            }
             IngestModuleAbstract moduleFound =  null;
             for (IngestModuleAbstract module : allModules) {
                 if (moduleName.equals(module.getName())) {
@@ -76,7 +79,7 @@ public class GeneralIngestConfigurator implements IngestConfigurator {
                 enabledModules.add(moduleFound);
             }
             else {
-                messages.add("Unable to load " + moduleName + " module");
+                messages.add("Unable to enable ingest module: " + moduleName);
             }
         }        
         ingestDialogPanel.setEnabledIngestModules(enabledModules);                            
diff --git a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SEUQAMappings.xml b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SEUQAMappings.xml
index 786192b39b..fea8cea8d8 100644
--- a/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SEUQAMappings.xml
+++ b/RecentActivity/src/org/sleuthkit/autopsy/recentactivity/SEUQAMappings.xml
@@ -33,6 +33,19 @@ splitToken:
 		<SearchEngine engine="Yahoo" domainSubstring=".yahoo." >
 			<splitToken plainToken="?p=" regexToken="\\?p=" />
 		</SearchEngine>
+                
+               <SearchEngine engine="Twitter" domainSubstring="twitter." >
+			<splitToken plainToken="?q=" regexToken="\\?q=" />
+			<splitToken plainToken="&amp;q=" regexToken="&amp;q="/> 
+               </SearchEngine>
+               
+                <SearchEngine engine="LinkedIn" domainSubstring=".linkedin." >
+			<splitToken plainToken="&amp;keywords=" regexToken="&amp;keywords="/> 
+               </SearchEngine>
+               
+                <SearchEngine engine="Facebook" domainSubstring=".facebook." >
+			<splitToken plainToken="?value=" regexToken="\\?value="/> 
+               </SearchEngine>
 
 		<SearchEngine engine="Bing" domainSubstring=".bing" >
 			<splitToken plainToken="?q=" regexToken="\\?q=" />