added category filtering