New additions, bug fix on category filter