Made faceted categories more flexible