Fixed: Category Flat and Product Flat issue