Re-Implement category filtering and added consumable filters.