diff --git a/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_all.gif b/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_all.gif
new file mode 100644
index 00000000000..0f5b4f1844b
Binary files /dev/null and b/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_all.gif differ
diff --git a/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_decl.gif b/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_decl.gif
new file mode 100644
index 00000000000..02861a89a1f
Binary files /dev/null and b/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_decl.gif differ
diff --git a/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_ref.gif b/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_ref.gif
new file mode 100644
index 00000000000..936ad6e3d41
Binary files /dev/null and b/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_ref.gif differ
diff --git a/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_type.gif b/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_type.gif
new file mode 100644
index 00000000000..efc48fbde4c
Binary files /dev/null and b/core/org.eclipse.cdt.ui.tests/icons/indexer_view/grouped_type.gif differ
diff --git a/core/org.eclipse.cdt.ui.tests/icons/indexer_view/stats.gif b/core/org.eclipse.cdt.ui.tests/icons/indexer_view/stats.gif
new file mode 100644
index 00000000000..0c5f2085409
Binary files /dev/null and b/core/org.eclipse.cdt.ui.tests/icons/indexer_view/stats.gif differ
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/FilterIndexerViewDialog.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/FilterIndexerViewDialog.java
index 9593d3f90fb..87d53ddec35 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/FilterIndexerViewDialog.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/FilterIndexerViewDialog.java
@@ -14,6 +14,7 @@ import java.util.Collection;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.eclipse.cdt.core.parser.util.ArrayUtil;
 import org.eclipse.cdt.internal.core.search.indexing.IIndexConstants;
 import org.eclipse.cdt.ui.CUIPlugin;
 import org.eclipse.cdt.ui.browser.typeinfo.TypeInfoMessages;
@@ -31,6 +32,7 @@ import org.eclipse.swt.layout.GridLayout;
 import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Shell;
 import org.eclipse.swt.widgets.Text;
@@ -40,6 +42,15 @@ import org.eclipse.swt.widgets.Text;
  */
 public class FilterIndexerViewDialog extends Dialog {
 
+    private static final int DECL_BUTTON_ID = 4;
+    private static final int REF_BUTTON_ID = 3;
+    private static final int TYPE_BUTTON_ID = 2;
+    private static final int ALL_BUTTON_ID = 1;
+    private static final String GROUPED_SELECTIONS_LABEL = "Grouped Selections:"; //$NON-NLS-1$
+    private static final String ALL_BUTTON = "All"; //$NON-NLS-1$
+    private static final String TYPE_BUTTON = "type"; //$NON-NLS-1$
+    private static final String DECL_BUTTON = "Decl"; //$NON-NLS-1$
+    private static final String REF_BUTTON = "Ref"; //$NON-NLS-1$
     private static final String BLANK_STRING = ""; //$NON-NLS-1$
     private static final String PAGE_SIZE_ = "Page Size:"; //$NON-NLS-1$
     private static final String TYPESELECTIONDIALOG_FILTERLABEL = "TypeSelectionDialog.filterLabel"; //$NON-NLS-1$
@@ -51,6 +62,7 @@ public class FilterIndexerViewDialog extends Dialog {
     private String pageSize = BLANK_STRING; //$NON-NLS-1$
     Text pageSizeText = null;
     protected Collection fFilterMatcher = new HashSet();
+    protected Collection groupedButtonSelections = new HashSet();
 
     private String message = "Filter Indexer Results (. = any character, .* = any string):"; //$NON-NLS-1$
 
@@ -127,18 +139,27 @@ public class FilterIndexerViewDialog extends Dialog {
     
     private String projName = null;
     
-    private static final int[] fAllTypes = { ENTRY_REF, ENTRY_TYPE_REF,
-            ENTRY_FUNCTION_REF, ENTRY_FUNCTION_DECL, // ENTRY_TYPE_DECL, 
-            ENTRY_CONSTRUCTOR_REF, ENTRY_CONSTRUCTOR_DECL, ENTRY_NAMESPACE_REF,
-            ENTRY_NAMESPACE_DECL, ENTRY_FIELD_REF, ENTRY_FIELD_DECL,
-            ENTRY_ENUMTOR_REF, ENTRY_ENUMTOR_DECL, ENTRY_METHOD_REF,
-            ENTRY_METHOD_DECL, ENTRY_MACRO_DECL, ENTRY_INCLUDE_REF,
-            ENTRY_SUPER_REF, ENTRY_TYPE_DECL_T, ENTRY_TYPE_DECL_C,
-            ENTRY_TYPE_DECL_V, ENTRY_TYPE_DECL_S, ENTRY_TYPE_DECL_E,
-            ENTRY_TYPE_DECL_U, ENTRY_TYPE_DECL_D, ENTRY_TYPE_DECL_F,
-            ENTRY_TYPE_DECL_G, ENTRY_TYPE_DECL_H, ENTRY_TYPE_DECL_I };
-
+    // this also determines the order that the buttons are displayed
+    private static final int[] fAllTypes = { // ENTRY_TYPE_DECL,
+        ENTRY_REF,              ENTRY_SUPER_REF,        ENTRY_MACRO_DECL,
+        ENTRY_FUNCTION_DECL,    ENTRY_NAMESPACE_DECL,   ENTRY_CONSTRUCTOR_DECL,    
+        ENTRY_FUNCTION_REF,     ENTRY_NAMESPACE_REF,    ENTRY_CONSTRUCTOR_REF,
+        ENTRY_FIELD_DECL,       ENTRY_ENUMTOR_DECL,     ENTRY_METHOD_DECL,
+        ENTRY_FIELD_REF,        ENTRY_ENUMTOR_REF,      ENTRY_METHOD_REF,
+        ENTRY_TYPE_REF,         ENTRY_TYPE_DECL_T,      ENTRY_TYPE_DECL_C,      
+        ENTRY_TYPE_DECL_V,      ENTRY_TYPE_DECL_S,      ENTRY_TYPE_DECL_E,
+        ENTRY_TYPE_DECL_U,      ENTRY_TYPE_DECL_D,      ENTRY_TYPE_DECL_F,
+        ENTRY_TYPE_DECL_G,      ENTRY_TYPE_DECL_H,      ENTRY_TYPE_DECL_I, 
+        ENTRY_INCLUDE_REF };
+    
     private Set fKnownTypes = new HashSet(fAllTypes.length);
+    
+    // keep track of the buttons to programmatically change their state
+    protected Button[] buttons = new Button[fAllTypes.length];
+    protected Button allButton = null;
+    protected Button typeButton = null;
+    protected Button declButton = null;
+    protected Button refButton = null;
 
     protected FilterIndexerViewDialog(Shell parentShell, IndexerNodeParent root, String projName) {
         super(parentShell);
@@ -190,6 +211,7 @@ public class FilterIndexerViewDialog extends Dialog {
         createMessageArea(composite);
         createFilterText(composite);
         createTypeFilterArea(composite);
+        createGroupedArea(composite);
         createPageSizeArea(composite);
 
         return composite;
@@ -334,6 +356,7 @@ public class FilterIndexerViewDialog extends Dialog {
         final Integer fTypeObject = typeObject;
         Button checkbox = new Button(composite, SWT.CHECK);
         checkbox.setFont(composite.getFont());
+        checkbox.setText(name);
         checkbox.setImage(icon);
         checkbox.setSelection(fFilterMatcher.contains(fTypeObject));
         checkbox.addSelectionListener(new SelectionAdapter() {
@@ -351,6 +374,8 @@ public class FilterIndexerViewDialog extends Dialog {
         Label label = new Label(composite, SWT.LEFT);
         label.setFont(composite.getFont());
         label.setText(name);
+        
+        buttons = (Button[])ArrayUtil.append(Button.class, buttons, checkbox);
     }
     
     private Image getTypeIcon(int type)
@@ -444,19 +469,198 @@ public class FilterIndexerViewDialog extends Dialog {
             if (fKnownTypes.contains(typeObject))
                 createTypeCheckbox(upperRow, typeObject);
         }
+    }
 
-        Composite lowerRow = new Composite(parent, SWT.NONE);
-        GridLayout lowerLayout = new GridLayout(1, true);
-        lowerLayout.verticalSpacing = 2;
-        lowerLayout.marginHeight = 0;
+    private void createGroupedArea(Composite parent) {
+        createLabel(parent, GROUPED_SELECTIONS_LABEL); 
+
+        Composite upperRow = new Composite(parent, SWT.NONE);
+        GridLayout upperLayout = new GridLayout(8, true);
+        upperLayout.verticalSpacing = 2;
+        upperLayout.marginHeight = 0;
         upperLayout.marginWidth = 0;
-        lowerRow.setLayout(lowerLayout);
+        upperRow.setLayout(upperLayout);
 
-        Composite composite = new Composite(lowerRow, SWT.NONE);
-        GridLayout layout = new GridLayout(2, false);
-        layout.marginHeight = 0;
-        layout.marginWidth = 0;
-        composite.setLayout(layout);
+        allButton = new Button(upperRow, SWT.CHECK);
+        allButton.setFont(upperRow.getFont());
+        allButton.setText(ALL_BUTTON);
+        allButton.setImage(IndexerViewPluginImages.get(IndexerViewPluginImages.IMG_GROUPED_ALL));
+        allButton.setSelection(groupedButtonSelections.contains(new Integer(ALL_BUTTON_ID)));
+        allButton.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) { 
+                if (e.widget instanceof Button) {
+                    Button aCheckbox = (Button) e.widget;
+                    boolean isChecked = aCheckbox.getSelection();
+                    
+                    Event event = new Event();
+                    
+                    // select/deselect all of the buttons in the buttons array
+                    for(int i=0; i<buttons.length; i++) {
+                        if (buttons[i]!=null) {
+                            if (isChecked) buttons[i].setSelection(true);
+                            else buttons[i].setSelection(false);
+                            event.widget = buttons[i];
+                            buttons[i].notifyListeners(SWT.Selection, event);
+                        }
+                    }
+                    
+                    // select/deselect the type, decl, ref buttons
+                    if (isChecked) {
+                        typeButton.setSelection(true);
+                        groupedButtonSelections.add(new Integer(TYPE_BUTTON_ID));
+                        declButton.setSelection(true);
+                        groupedButtonSelections.add(new Integer(DECL_BUTTON_ID));
+                        refButton.setSelection(true);
+                        groupedButtonSelections.add(new Integer(REF_BUTTON_ID));
+                        groupedButtonSelections.add(new Integer(ALL_BUTTON_ID));                        
+                    }
+                    else {
+                        typeButton.setSelection(false);
+                        groupedButtonSelections.remove(new Integer(TYPE_BUTTON_ID));
+                        declButton.setSelection(false);
+                        groupedButtonSelections.remove(new Integer(DECL_BUTTON_ID));
+                        refButton.setSelection(false);
+                        groupedButtonSelections.remove(new Integer(REF_BUTTON_ID));
+                        groupedButtonSelections.remove(new Integer(ALL_BUTTON_ID));
+                    }
+                }
+            }
+        });
+
+        Label label = new Label(upperRow, SWT.LEFT);
+        label.setFont(upperRow.getFont());
+        label.setText(ALL_BUTTON);
+        
+        typeButton = new Button(upperRow, SWT.CHECK);
+        typeButton.setFont(upperRow.getFont());
+        typeButton.setText(TYPE_BUTTON);
+        typeButton.setImage(IndexerViewPluginImages.get(IndexerViewPluginImages.IMG_GROUPED_TYPE));
+        typeButton.setSelection(groupedButtonSelections.contains(new Integer(TYPE_BUTTON_ID)));
+        typeButton.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) {
+                if (e.widget instanceof Button) {
+                    Button aCheckbox = (Button) e.widget;
+                    boolean isChecked = aCheckbox.getSelection();
+                    
+                    Event event = new Event();
+                    
+                    // select/deselect all of the buttons in the buttons array
+                    for(int i=0; i<buttons.length; i++) {
+                        if (buttons[i] != null) {
+                            if (buttons[i].getText().indexOf(TYPE_BUTTON) >= 0) {
+                                if (isChecked) buttons[i].setSelection(true);
+                                else buttons[i].setSelection(false);
+                                event.widget = buttons[i];
+                                buttons[i].notifyListeners(SWT.Selection, event);
+                            }
+                        }
+                    }
+                    
+                    if (isChecked) groupedButtonSelections.add(new Integer(TYPE_BUTTON_ID));
+                    else groupedButtonSelections.remove(new Integer(TYPE_BUTTON_ID));
+                    
+                    checkAllButton();
+                }
+            }
+        });
+
+        label = new Label(upperRow, SWT.LEFT);
+        label.setFont(upperRow.getFont());
+        label.setText(TYPE_BUTTON);
+        
+        declButton = new Button(upperRow, SWT.CHECK);
+        declButton.setFont(upperRow.getFont());
+        declButton.setText(DECL_BUTTON);
+        declButton.setImage(IndexerViewPluginImages.get(IndexerViewPluginImages.IMG_GROUPED_DECL));
+        declButton.setSelection(groupedButtonSelections.contains(new Integer(DECL_BUTTON_ID)));
+        declButton.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) {
+                if (e.widget instanceof Button) {
+                    Button aCheckbox = (Button) e.widget;
+                    boolean isChecked = aCheckbox.getSelection();
+                    
+                    Event event = new Event();
+                    
+                    // select/deselect all of the buttons in the buttons array
+                    for(int i=0; i<buttons.length; i++) {
+                        if (buttons[i] != null) {
+                            if (buttons[i].getText().indexOf(DECL_BUTTON) >= 0) {
+                                if (isChecked) buttons[i].setSelection(true);
+                                else buttons[i].setSelection(false);
+                                event.widget = buttons[i];
+                                buttons[i].notifyListeners(SWT.Selection, event);
+                            }
+                        }
+                    }
+                    
+                    if (isChecked) groupedButtonSelections.add(new Integer(DECL_BUTTON_ID));
+                    else groupedButtonSelections.remove(new Integer(DECL_BUTTON_ID));
+                    
+                    checkAllButton();
+                }
+            }
+        });
+
+        label = new Label(upperRow, SWT.LEFT);
+        label.setFont(upperRow.getFont());
+        label.setText(DECL_BUTTON);
+        
+        refButton = new Button(upperRow, SWT.CHECK);
+        refButton.setFont(upperRow.getFont());
+        refButton.setText(REF_BUTTON);
+        refButton.setImage(IndexerViewPluginImages.get(IndexerViewPluginImages.IMG_GROUPED_REF));
+        refButton.setSelection(groupedButtonSelections.contains(new Integer(REF_BUTTON_ID)));
+        refButton.addSelectionListener(new SelectionAdapter() {
+            public void widgetSelected(SelectionEvent e) {
+                if (e.widget instanceof Button) {
+                    Button aCheckbox = (Button) e.widget;
+                    boolean isChecked = aCheckbox.getSelection();
+                    
+                    Event event = new Event();
+                    
+                    // select/deselect all of the buttons in the buttons array
+                    for(int i=0; i<buttons.length; i++) {
+                        if (buttons[i] != null) {
+                            if (buttons[i].getText().toUpperCase().indexOf(REF_BUTTON.toUpperCase()) >= 0) {
+                                if (isChecked) buttons[i].setSelection(true);
+                                else buttons[i].setSelection(false);
+                                event.widget = buttons[i];
+                                buttons[i].notifyListeners(SWT.Selection, event);
+                            }
+                        }
+                    }
+                    
+                    if (isChecked) groupedButtonSelections.add(new Integer(REF_BUTTON_ID));
+                    else groupedButtonSelections.remove(new Integer(REF_BUTTON_ID));
+                    
+                    checkAllButton();
+                }
+            }
+        });
+
+        label = new Label(upperRow, SWT.LEFT);
+        label.setFont(upperRow.getFont());
+        label.setText(REF_BUTTON);
+    }
+    
+    void checkAllButton() {
+        // alter the state of allButton if everything is checked or not
+        boolean isChecked=true;
+        for(int i=0; i<buttons.length; i++) {
+            if (!buttons[i].getSelection()) {
+                isChecked=false;
+                break;
+            }
+        }
+        
+        if (isChecked) {
+            allButton.setSelection(true);
+            groupedButtonSelections.add(new Integer(ALL_BUTTON_ID));
+        }
+        else {
+            allButton.setSelection(false);
+            groupedButtonSelections.remove(new Integer(ALL_BUTTON_ID));
+        }
     }
     
     /**
@@ -583,6 +787,11 @@ public class FilterIndexerViewDialog extends Dialog {
         section.put(ENTRY_TYPE_DECL_H_STRING, fFilterMatcher.contains(new Integer(ENTRY_TYPE_DECL_H)));
         section.put(ENTRY_TYPE_DECL_I_STRING, fFilterMatcher.contains(new Integer(ENTRY_TYPE_DECL_I)));
         
+        section.put(ALL_BUTTON, groupedButtonSelections.contains(new Integer(ALL_BUTTON_ID)));
+        section.put(TYPE_BUTTON, groupedButtonSelections.contains(new Integer(TYPE_BUTTON_ID)));
+        section.put(REF_BUTTON, groupedButtonSelections.contains(new Integer(REF_BUTTON_ID)));
+        section.put(DECL_BUTTON, groupedButtonSelections.contains(new Integer(DECL_BUTTON_ID)));
+        
         section.put(PAGE_SIZE, pageSize);
     }
 
@@ -817,6 +1026,24 @@ public class FilterIndexerViewDialog extends Dialog {
             if (fKnownTypes.contains(typeObject))
                 fFilterMatcher.add(typeObject);
         }
+        
+        // get the grouped button selection status
+        if (section.getBoolean(ALL_BUTTON)) {
+            Integer typeObject = new Integer(ALL_BUTTON_ID);
+            groupedButtonSelections.add(typeObject);
+        }
+        if (section.getBoolean(TYPE_BUTTON)) {
+            Integer typeObject = new Integer(TYPE_BUTTON_ID);
+            groupedButtonSelections.add(typeObject);
+        }
+        if (section.getBoolean(REF_BUTTON)) {
+            Integer typeObject = new Integer(REF_BUTTON_ID);
+            groupedButtonSelections.add(typeObject);
+        }
+        if (section.getBoolean(DECL_BUTTON)) {
+            Integer typeObject = new Integer(DECL_BUTTON_ID);
+            groupedButtonSelections.add(typeObject);
+        }
     }
     
     public IndexerFilterManager createFilterManager() {
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerNodeParent.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerNodeParent.java
index 7cdf9a9d0ad..c0f8c7f9a72 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerNodeParent.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerNodeParent.java
@@ -39,6 +39,7 @@ public class IndexerNodeParent extends IndexerNodeLeaf {
         // create an IndexerFilterManager using the FilterIndexerViewDialog (since all of the work is done there anyways)
         FilterIndexerViewDialog dialog = new FilterIndexerViewDialog(CTestPlugin.getStandardDisplay().getActiveShell(), this, view.getProjectName());
         dialog.readSettings(dialog.getDialogSettings());
+        
         filterManager = dialog.createFilterManager();
         
         try {
@@ -173,5 +174,12 @@ public class IndexerNodeParent extends IndexerNodeLeaf {
     public void setView(IndexerView.ViewContentProvider view) {
         this.view = view;
     }
-    
+
+    public int getFilteredCount() {
+        int filteredCount=0;
+        for(int i=0; i<children.length; i++) {
+            if (filterManager.isFiltered(children[i])) filteredCount++;
+        }
+        return filteredCount;
+    }
 }
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerView.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerView.java
index 6877e8352c8..92992b1fae5 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerView.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerView.java
@@ -57,6 +57,10 @@ import org.eclipse.ui.views.properties.PropertySheet;
  * @author dsteffle
  */
 public class IndexerView extends ViewPart {
+    private static final String _TOTAL_IENTRYRESULTS = " total IEntryResults"; //$NON-NLS-1$
+    private static final String _FILTERED_IENTRY_RESULTS_ = " filtered IEntry Results\n"; //$NON-NLS-1$
+    private static final String INDEXER_STATS = "Indexer Stats"; //$NON-NLS-1$
+    private static final String DISPLAY_INDEX_STATS = "Display Index Stats"; //$NON-NLS-1$
     private static final String INDEXER_VIEW___ = "Indexer View - "; //$NON-NLS-1$
     private static final String _INDEXER_MENU_MANAGER = "#Indexer_Menu_Manager"; //$NON-NLS-1$
     private static final String SET_FILTERS = "Set Filters"; //$NON-NLS-1$
@@ -70,6 +74,7 @@ public class IndexerView extends ViewPart {
     protected Action nextPageAction;
     protected Action singleClickAction;
     protected Action setFiltersAction;
+    protected Action displayStatsAction;
     protected IIndexer[] indexers = new IIndexer[CTestPlugin.getWorkspace().getRoot().getProjects().length];
     protected IProject project = null;
         
@@ -85,6 +90,7 @@ public class IndexerView extends ViewPart {
         protected boolean displayBackwards=false;
         
         private class InitializeView extends Job {
+            private static final String NULL_PROJECT_SELECTED = "A null project was selected."; //$NON-NLS-1$
             private static final String ALL_NAME_SEARCH = "*"; //$NON-NLS-1$
             private static final String INDEXER_VIEW = "Indexer View"; //$NON-NLS-1$
             TableViewer theViewer = null;
@@ -102,7 +108,7 @@ public class IndexerView extends ViewPart {
                             CTestPlugin.getStandardDisplay().asyncExec(new Runnable() {
                                 public void run() {
                                     MessageDialog.openInformation(theViewer.getControl().getShell(), INDEXER_VIEW,
-                                    "SourceIndexer points to a null project."); //$NON-NLS-1$ //$NON-NLS-2$        
+                                    NULL_PROJECT_SELECTED);        
                                 }
                             });
                             
@@ -412,7 +418,7 @@ public class IndexerView extends ViewPart {
             public void run() {
                 if (!(viewer.getContentProvider() instanceof ViewContentProvider)) return;
 
-                FilterIndexerViewDialog dialog = new FilterIndexerViewDialog(getSite().getShell(), ((ViewContentProvider)viewer.getContentProvider()).getInvisibleRoot(), project.getName());
+                FilterIndexerViewDialog dialog = new FilterIndexerViewDialog(getSite().getShell(), ((ViewContentProvider)viewer.getContentProvider()).getInvisibleRoot(), (project==null?BLANK_STRING:project.getName()));
                 int result = dialog.open();
                 
                 if (result == IDialogConstants.OK_ID) {
@@ -428,6 +434,24 @@ public class IndexerView extends ViewPart {
         setFiltersAction.setToolTipText(SET_FILTERS);
         setFiltersAction.setImageDescriptor(IndexerViewPluginImages.DESC_FILTER_BUTTON);
         
+        displayStatsAction = new Action() {
+            public void run() {
+                CTestPlugin.getStandardDisplay().asyncExec(new Runnable() {
+                    public void run() {
+                        if (viewer.getContentProvider() instanceof ViewContentProvider) {
+                            IndexerNodeParent root = ((ViewContentProvider)viewer.getContentProvider()).getInvisibleRoot();
+                            
+                            MessageDialog.openInformation(getSite().getShell(), INDEXER_STATS,
+                                    root.getFilteredCount() + _FILTERED_IENTRY_RESULTS_ + root.getFullLength() + _TOTAL_IENTRYRESULTS);
+                        }
+                    }
+                });
+            }
+        };
+        displayStatsAction.setText(DISPLAY_INDEX_STATS);
+        displayStatsAction.setToolTipText(DISPLAY_INDEX_STATS);
+        displayStatsAction.setImageDescriptor(IndexerViewPluginImages.DESC_STATS);
+        
         singleClickAction = new IndexerHighlighterAction();
     }
 
@@ -459,7 +483,7 @@ public class IndexerView extends ViewPart {
             
             IViewPart part = getSite().getPage().findView(PROPERTIES_VIEW);
             if (part instanceof PropertySheet) {
-                ((PropertySheet)part).selectionChanged(getSite().getPart(), selection); // TODO Devin need to instead get the part that this action belongs to... 
+                ((PropertySheet)part).selectionChanged(getSite().getPart(), selection); 
             }
         }
     }
@@ -487,6 +511,8 @@ public class IndexerView extends ViewPart {
         manager.add(new Separator());
         manager.add(setFiltersAction);
         manager.add(new Separator());
+        manager.add(displayStatsAction);
+        manager.add(new Separator());
     }
 
     public void setFocus() {
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerViewPluginImages.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerViewPluginImages.java
index c5c8d5042ed..98d0c9eba6b 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerViewPluginImages.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/IndexerViewPluginImages.java
@@ -85,6 +85,11 @@ public class IndexerViewPluginImages {
     public static final String IMG_FWD_UNION= NAME_PREFIX + "fwd_union.gif"; //$NON-NLS-1$
     public static final String IMG_WARNING= NAME_PREFIX + "warning_icon.gif"; //$NON-NLS-1$
     public static final String IMG_FILTER_BUTTON= NAME_PREFIX + "filterbutton.gif"; //$NON-NLS-1$
+    public static final String IMG_STATS= NAME_PREFIX + "stats.gif"; //$NON-NLS-1$
+    public static final String IMG_GROUPED_ALL= NAME_PREFIX + "grouped_all.gif"; //$NON-NLS-1$
+    public static final String IMG_GROUPED_DECL= NAME_PREFIX + "grouped_decl.gif"; //$NON-NLS-1$
+    public static final String IMG_GROUPED_REF= NAME_PREFIX + "grouped_ref.gif"; //$NON-NLS-1$
+    public static final String IMG_GROUPED_TYPE= NAME_PREFIX + "grouped_type.gif"; //$NON-NLS-1$
     
     public static final ImageDescriptor DESC_REF= createManaged(ICON_PREFIX, IMG_REF);
     public static final ImageDescriptor DESC_TYPE_REF= createManaged(ICON_PREFIX, IMG_TYPE_REF);
@@ -119,6 +124,11 @@ public class IndexerViewPluginImages {
     public static final ImageDescriptor DESC_FWD_UNION= createManaged(ICON_PREFIX, IMG_FWD_UNION);
     public static final ImageDescriptor DESC_WARNING= createManaged(ICON_PREFIX, IMG_WARNING);
     public static final ImageDescriptor DESC_FILTER_BUTTON= createManaged(ICON_PREFIX, IMG_FILTER_BUTTON);
+    public static final ImageDescriptor DESC_STATS= createManaged(ICON_PREFIX, IMG_STATS);
+    public static final ImageDescriptor DESC_GROUPED_ALL= createManaged(ICON_PREFIX, IMG_GROUPED_ALL);
+    public static final ImageDescriptor DESC_GROUPED_DECL= createManaged(ICON_PREFIX, IMG_GROUPED_DECL);
+    public static final ImageDescriptor DESC_GROUPED_REF= createManaged(ICON_PREFIX, IMG_GROUPED_REF);
+    public static final ImageDescriptor DESC_GROUPED_TYPE= createManaged(ICON_PREFIX, IMG_GROUPED_TYPE);
     
     private static ImageDescriptor createManaged(String prefix, String name) {
         return createManaged(imageRegistry, prefix, name);
diff --git a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/OpenIndexerViewAction.java b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/OpenIndexerViewAction.java
index 1101a1529dd..730307b7a0d 100644
--- a/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/OpenIndexerViewAction.java
+++ b/core/org.eclipse.cdt.ui.tests/src/org/eclipse/cdt/ui/tests/IndexerView/OpenIndexerViewAction.java
@@ -43,8 +43,6 @@ public class OpenIndexerViewAction implements IViewActionDelegate,
         IViewPart tempView = null;
 
         try {
-            // TODO Devin add support for multiple views
-//          tempView = viewPart.getSite().getPage().showView(IndexerView.VIEW_ID, proj.getName(), IWorkbenchPage.VIEW_ACTIVATE);
             tempView = viewPart.getSite().getPage().showView(IndexerView.VIEW_ID);
             if (tempView instanceof IndexerView)
                 ((IndexerView)tempView).setProject(proj);