Improve performance in MasterCategoryCreator
Remove double filtering and chart building
Improve performance with CategoryMaster