Fixed ParentCategoryID based filtering and hierarchy