Tweeked the category filtering