--- a/Tools__ClassCategoryList.st	Thu Apr 04 01:43:18 2013 +0100
+++ b/Tools__ClassCategoryList.st	Thu Apr 04 19:06:16 2013 +0100
@@ -271,7 +271,7 @@
 
 delayedUpdate:something with:aParameter from:changedObject
     |selectedCategories allSelectedBefore 
-     nameListEntryForALL categoryOfClass wg|
+     nameListEntryForALL cls categoryOfClass wg|
 
     selectedCategories := self selectedCategoriesStrings.
 
@@ -312,6 +312,33 @@
             ].
             ^ self
         ].
+        something == #projectOrganization ifTrue:[
+            listValid == false ifTrue:[
+                ^ self
+            ].
+            aParameter isNil ifTrue:[
+                self invalidateList.                
+                slaveMode value ~~ true ifTrue:[
+                    selectedCategories notEmptyOrNil ifTrue:[
+                        self enqueueDelayedUpdateOutputGenerator
+                    ].
+                ]
+            ] ifFalse:[
+                cls := aParameter first.
+                categoryOfClass := cls category.
+
+                (rawCategoryList includes:categoryOfClass) ifFalse:[
+                    self invalidateList.                
+                ].
+
+                slaveMode value ~~ true ifTrue:[
+                    (selectedCategories includes:categoryOfClass) ifTrue:[
+                        self enqueueDelayedUpdateOutputGenerator
+                    ].
+                ]
+            ].
+            ^ self
+        ].
 
         self invalidateList.
 
@@ -634,7 +661,10 @@
     |categories categoriesBag hideUnloadedClasses generator nameSpaceFilter packageFilter allName
      categoriesWithExtensions categoriesWithChangedCode categoriesWithRemoteChangedCode
      classesInChangeSet classesInRemoteChangeSet classesWithExtensions
-     numClassesInChangeSet numClasses numUnloaded numUndocumented numExtendedClasses pseudoEntryColor|
+     numClassesInChangeSet numClasses numUnloaded numUndocumented numExtendedClasses 
+     pseudoEntryColor showCounts|
+
+    showCounts := true.
 
     allName := self class nameListEntryForALL.
 
@@ -767,8 +797,10 @@
                     ]
                 ]
             ].
-            item := item , ((' (%1)' bindWith:(categoriesBag occurrencesOf:cat)) 
-                                colorizeAllWith:pseudoEntryColor).
+            showCounts ifTrue:[
+                item := item , ((' (%1)' bindWith:(categoriesBag occurrencesOf:cat)) 
+                                    colorizeAllWith:pseudoEntryColor).
+            ].
             isInChangeSet ifTrue:[
                 item := item , self class markForBeingInChangeList
             ].
@@ -788,7 +820,7 @@
         rawCategoryList add:self class nameListEntryForExtendedClasses.
         categories add:((self class nameListEntryForExtendedClassesWithCount bindWith:numExtendedClasses) allItalic colorizeAllWith:pseudoEntryColor).
     ].
-    numClassesInChangeSet := ChangeSet current changedClasses size.
+    numClassesInChangeSet := (ChangeSet current changedClasses collect:[:c | c theNonMetaclass] as:Set) size.
     numClassesInChangeSet > 0 ifTrue:[
         rawCategoryList addFirst:self class nameListEntryForChanged.
         categories addFirst:((self class nameListEntryForChangedWithCount bindWith:numClassesInChangeSet) allItalic colorizeAllWith:pseudoEntryColor).