Fix select duplication

Fix the select elements duplication in case of validation error.
Merge branch '2.1'