Added basic category filterin