Fix for consistent state of categories in sampledata