Fixing bad validation, leaving validation to the rendering.

Sorry, had a left over case which did not work as expected.

Now its all done.