--- a/DirectoryView.st	Fri Feb 06 19:54:58 1998 +0100
+++ b/DirectoryView.st	Fri Feb 06 21:11:24 1998 +0100
@@ -353,15 +353,17 @@
 
 readDirectory
 
-    |foundFiles| 
+    |foundFiles list|    
     foundFiles := OrderedCollection new.
+    list := self listOfFileFilters value.
+
     Cursor wait showWhile: 
     [ 
-        (DirectoryContents directoryNamed: directory) filesDo: 
-        [:file| 
-            self listOfFileFilters value do:
+        (DirectoryContents directoryNamed: directory) filesAndBasenamesDo: 
+        [:file :name|      
+            list do:
             [:filter|
-                (file name includesMatchString: filter)
+                (filter match: name)
                 ifTrue:
                 [
                     foundFiles add: (FileRow new fileName: file)
@@ -370,6 +372,7 @@
         ].
         self listOfFiles contents: foundFiles
     ]
+
 !
 
 readMonitoringDirectory
@@ -652,8 +655,7 @@
 
 fileName: aFileName
 
-    fileName := aFileName.
-    self validateAttributes
+    fileName := aFileName
 !
 
 group
@@ -666,6 +668,7 @@
     (aGC registeredImageAt:iconKey) isNil
     ifTrue:
     [
+        self validateAttributes.
         ((iconKey == #imageFileIcon) and: [size < 5000])
         ifTrue:
         [