And fix a breaking change leading to an evaluation failure.
Should avoid a bunch of error logs, and ensure that e.g: adding a label does not require a refresh to show it in a list.
