Improve some validators in form