Refactor extension filtering by category
Filtering works!
Make both filtering and categories work in unison