diff --git a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Index.java b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Index.java
index 4eb443c318..16b262b801 100644
--- a/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Index.java
+++ b/KeywordSearch/src/org/sleuthkit/autopsy/keywordsearch/Index.java
@@ -86,15 +86,10 @@ final class Index {
     static private String sanitizeCoreName(String coreName) {
 
         String result;
-
-        // Remove all non-ASCII characters
-        result = coreName.replaceAll("[^\\p{ASCII}]", "_"); //NON-NLS
-
-        // Remove all control characters
-        result = result.replaceAll("[\\p{Cntrl}]", "_"); //NON-NLS
-
-        // Remove spaces / \ : ? ' "
-        result = result.replaceAll("[ /?:'\"\\\\]", "_"); //NON-NLS
+        
+        // Allow these characters: '-', '.', '0'-'9', 'A'-'Z', '_', and 'a'-'z'.
+        // Replace all else with '_'.
+        result = coreName.replaceAll("[^-.0-9A-Z_a-z]", "_"); // NON-NLS
 
         // Make it all lowercase
         result = result.toLowerCase();