Re-enable filtering in hierarchical menus.  Renamed the menu classes
to be hierarchical menu classes.