Added category, improved filtering