Sample Data completition
Category filtering implemented