Added proper category filtering