Fix categories management.