Readded category name filter
REVERT THIS IF IT MAKES THINGS SAD
Merged a thang for benchmarking