Added category filter; TODO display the category names, same applies to SPs and SUs.