badgeCRUD fixes