Fixed enum validator sanitisation

Signed-off-by: Tom Wright <tom@inflatablecookie.com>
Fixed selector error messages

Signed-off-by: Tom Wright <tom@inflatablecookie.com>