I see you've used this check for the unit list as well but removed the `data-id` assignment from the template...