CARE #25: Fixed adding/removing categories