Fix the todos in the applicators that were hardcoding the id properties.