Added ability to fliter on category