Fix null in API with groups