Added category filtering