Changes to support filtering

Added support for button categories to filter results