Filters working and class category/subcategory and project Activities optimized
Merge remote-tracking branch 'origin/master'