New feature: Adding search filters and grouping