Fix categories and checkbox