Changes to make completion tickboxes better