Comfort Station list was fine, it was Key mapping on save of Comfort Station that was using ComfortStation instead of Team for Entity type