IFJJV-121-RS-CategoryFilter

Created CategoryFilter and fixed some bugs.