--- a/Tools__BreakpointBrowser.st	Fri Jan 19 10:44:32 2018 +0100
+++ b/Tools__BreakpointBrowser.st	Fri Jan 19 11:03:15 2018 +0100
@@ -1039,24 +1039,7 @@
 
 !BreakpointBrowser methodsFor:'change & update'!
 
-delayedUpdate:something with:aParameter from:changedObject
-    changedObject == Smalltalk ifTrue:[
-        something == #methodInClass ifTrue:[
-            self updateForClass:(aParameter first) selector:(aParameter second).
-            ^ self.
-        ].
-        something == #methodInClassRemoved ifTrue:[
-            self updateForClass:(aParameter first) selector:(aParameter second).
-            ^ self.
-        ].
-        something == #ignoredHalts ifTrue:[
-            self updateShownBreakpointList.
-            ^ self.
-        ].
-    ].
-!
-
-filter
+applyFilter
     "filter those items which are to be shown from the complete list"
 
     |newList showWhichHalt|
@@ -1138,6 +1121,23 @@
     shownCopyOfBreakpointList contents:newList.
 !
 
+delayedUpdate:something with:aParameter from:changedObject
+    changedObject == Smalltalk ifTrue:[
+        something == #methodInClass ifTrue:[
+            self updateForClass:(aParameter first) selector:(aParameter second).
+            ^ self.
+        ].
+        something == #methodInClassRemoved ifTrue:[
+            self updateForClass:(aParameter first) selector:(aParameter second).
+            ^ self.
+        ].
+        something == #ignoredHalts ifTrue:[
+            self updateShownBreakpointList.
+            ^ self.
+        ].
+    ].
+!
+
 messageSelectors
     ^ self messagesAndTypes collect:[:each | each first] as:Set.
 !
@@ -1300,10 +1300,8 @@
 updateShownBreakpointList
 
     self shownCopyOfBreakpointList contents:breakpointList.
-    self filter.
+    self applyFilter.
     self resort.
-
-
 !
 
 withBreakpointListEntriesFor:mthd class:cls selector:sel 
@@ -1926,22 +1924,30 @@
 !BreakpointBrowser::BreakpointListEntry methodsFor:'queries'!
 
 relatedToClass:aClassNamePattern
+    "true if this breakpoint is in code related to a class (for filter)"
+
     className isNil ifTrue:[^ true].
+
     (aClassNamePattern includesMatchCharacters) ifTrue:[
-         ^ aClassNamePattern match: className
+         ^ aClassNamePattern match:className caseSensitive:false
     ].
-    ^ className startsWith:aClassNamePattern
+    ^ className includesString:aClassNamePattern caseSensitive:false.
+    "/ ^ className startsWith:aClassNamePattern
 !
 
 relatedToPackage:aPackagePattern
+    "true if this breakpoint is in code related to the package (for filter)"
+
     |mthd package|
 
     (mthd := self method) isNil ifTrue:[^ false].
+
     package := mthd package.
     (aPackagePattern includesMatchCharacters) ifTrue:[
-         ^ aPackagePattern match: package
+         ^ aPackagePattern match:package caseSensitive:false
     ].
-    ^ package startsWith:aPackagePattern
+    ^ package includesString:aPackagePattern caseSensitive:false.
+    "/ ^ package startsWith:aPackagePattern
 ! !
 
 !BreakpointBrowser::BreakpointListEntry methodsFor:'testing'!