Selector fix and another Validator

Dunno why Git thinks the commits from @mottosso are different from the original repo.