Applied small optimization

You should never rely on an ID. Instead, you should get the ID by it's unique name.