Tweaks to checkbox selector