Fixing badge type filtering

- Changing labels
- Adjusting filter properties