diff --git a/core/src/main/groovy/com/muwire/core/Constants.groovy b/core/src/main/groovy/com/muwire/core/Constants.groovy
index fc7e2516..624bad15 100644
--- a/core/src/main/groovy/com/muwire/core/Constants.groovy
+++ b/core/src/main/groovy/com/muwire/core/Constants.groovy
@@ -11,5 +11,5 @@ class Constants {
     
     public static final float DOWNLOAD_SEQUENTIAL_RATIO = 0.8f
     
-    public static final String SPLIT_PATTERN = "[\\.,_-<>:;]"
+    public static final String SPLIT_PATTERN = "[\\.,_-]"
 }
diff --git a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
index 5b47ee88..0ab82210 100644
--- a/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
+++ b/gui/griffon-app/views/com/muwire/gui/MainFrameView.groovy
@@ -14,6 +14,7 @@ import javax.swing.ListSelectionModel
 import javax.swing.SwingConstants
 import javax.swing.border.Border
 
+import com.muwire.core.Constants
 import com.muwire.core.download.Downloader
 import com.muwire.core.files.FileSharedEvent
 
@@ -183,7 +184,11 @@ class MainFrameView {
                             scrollPane(constraints : BorderLayout.CENTER) {
                                 table(id : "searches-table") {
                                     tableModel(list : model.searches) {
-                                        closureColumn(header : "Keywords", type : String, read : { it.search })
+                                        closureColumn(header : "Keywords", type : String, read : { 
+                                            def sanitized = String.replaceAll(Constants.SPLIT_PATTERN,it.search)
+                                            sanitized = sanitized.replace("<", " ")
+                                            sanitized 
+                                        })
                                         closureColumn(header : "From", type : String, read : {
                                             if (it.originator != null) {
                                                 return it.originator.getHumanReadableName()